Skip to content

fix: remove NetworkManager.Singleton dependencies #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoelStephensUnity merged 4 commits into from
Mar 16, 2021
Merged

fix: remove NetworkManager.Singleton dependencies #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f6649b
fix: remove singleton references
NoelStephensUnity Mar 15, 2021
5dcd1e3
Update com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueu…
NoelStephensUnity Mar 15, 2021
8cdc294
Merge branch 'develop' into fix/rpcqueueremovesingleton
NoelStephensUnity Mar 16, 2021
302e789
Fix: Weird Merging Artifact?
NoelStephensUnity Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,17 +333,13 @@ private void Init(bool server)
if (RpcQueueContainer != null)
{
UnityEngine.Debug.LogError("Init was invoked, but rpcQueueContainer was already initialized! (destroying previous instance)");
RpcQueueContainer.Shutdown();
RpcQueueContainer.Dispose();
RpcQueueContainer = null;
}

//The RpcQueueContainer must be initialized within the Init method ONLY
//It should ONLY be shutdown and destroyed in the Shutdown method (other than just above)
RpcQueueContainer = new RpcQueueContainer(false);

//Note: Since frame history is not being used, this is set to 0
//To test frame history, increase the number to (n) where n > 0
RpcQueueContainer.Initialize(0);
RpcQueueContainer = new RpcQueueContainer(this);

// Register INetworkUpdateSystem (always register this after rpcQueueContainer has been instantiated)
this.RegisterNetworkUpdate(NetworkUpdateStage.EarlyUpdate);
Expand Down Expand Up @@ -608,7 +604,7 @@ public void Shutdown()
//If an instance of the RpcQueueContainer is still around, then shut it down and remove the reference
if (RpcQueueContainer != null)
{
RpcQueueContainer.Shutdown();
RpcQueueContainer.Dispose();
RpcQueueContainer = null;
}

Expand Down
Loading