Skip to content

refactor: remove NetworkManager.Singleton dependencies, add additional instance tracking and notification when LogLevel.Developer #562

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 18 commits into from
Mar 10, 2021
Merged

refactor: remove NetworkManager.Singleton dependencies, add additional instance tracking and notification when LogLevel.Developer #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
81ea9a5
refactor: better handle instantiating and lack of a NetworkManager
NoelStephensUnity Mar 9, 2021
3890232
fix: increment the instance count before logging
NoelStephensUnity Mar 9, 2021
defc3ce
Revert "fix: increment the instance count before logging"
NoelStephensUnity Mar 9, 2021
1030171
fix: increment before log
NoelStephensUnity Mar 9, 2021
1790055
style: typo on the shutting down message
NoelStephensUnity Mar 9, 2021
e43b18b
refactor: Remove all NetworkManager.Singleton dependencies
NoelStephensUnity Mar 9, 2021
c8b44bf
refactor: further improved dependencies and expanded unit testing
NoelStephensUnity Mar 9, 2021
198693d
Update com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueu…
NoelStephensUnity Mar 9, 2021
995db9e
Update com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueu…
NoelStephensUnity Mar 9, 2021
beffa6a
style and developer:
NoelStephensUnity Mar 9, 2021
7de00a7
Merge branch 'fix/rpcstartupshutdown' of https://github.com/Unity-Tec…
NoelStephensUnity Mar 9, 2021
0c5a194
fix:
NoelStephensUnity Mar 9, 2021
67c6f56
refactor: updated minor debug messages.
NoelStephensUnity Mar 9, 2021
68f4683
Merge branch 'release/0.1.0' into fix/rpcstartupshutdown
NoelStephensUnity Mar 9, 2021
5e09060
style
NoelStephensUnity Mar 10, 2021
25c9951
style
NoelStephensUnity Mar 10, 2021
a5082f4
minor update
0xFA11 Mar 10, 2021
2737014
refactor:
NoelStephensUnity Mar 10, 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
12 changes: 4 additions & 8 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 @@ -324,17 +324,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 @@ -599,7 +595,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 Expand Up @@ -1487,4 +1483,4 @@ internal void HandleApproval(ulong clientId, bool createPlayerObject, ulong? pla
}
}
}
}
}
Loading