Skip to content

fix: cleaning up connected clients upon shutdown [MTT-1573] (backport #1945) #1949

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
0xFA11 merged 5 commits into from
May 9, 2022
Merged

fix: cleaning up connected clients upon shutdown [MTT-1573] (backport #1945) #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
713d761
chore: cleaning up connected clients upon shutdown [MTT-1573]
jeffreyrainy May 8, 2022
4cd2cbc
chore: cleaning up connected clients upon shutdown [MTT-1573] changelog
jeffreyrainy May 9, 2022
9b2d780
Update com.unity.netcode.gameobjects/CHANGELOG.md
0xFA11 May 9, 2022
cb52489
Merge branch 'release/1.0.0' into chore/client-cleanup-backport
0xFA11 May 9, 2022
9eb4196
Update CHANGELOG.md
0xFA11 May 9, 2022
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
6 changes: 3 additions & 3 deletions com.unity.netcode.gameobjects/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Additional documentation and release notes are available at [Multiplayer Documen

### Fixed

- Fixed: Hosting again after failing to host now works correctly

- Fixed: NetworkHide followed by NetworkShow on the same frame works correctly (#1940)
- Fixed Hosting again after failing to host now works correctly (#1938)
- Fixed NetworkManager to cleanup connected client lists after stopping (#1945)
- Fixed NetworkHide followed by NetworkShow on the same frame works correctly (#1940)

## [1.0.0-pre.8] - 2022-04-27

Expand Down
19 changes: 13 additions & 6 deletions com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,12 +765,7 @@ private void Initialize(bool server)
#endif
LocalClientId = ulong.MaxValue;

PendingClients.Clear();
m_ConnectedClients.Clear();
m_ConnectedClientsList.Clear();
m_ConnectedClientIds.Clear();
LocalClient = null;
NetworkObject.OrphanChildren.Clear();
ClearClients();

// Create spawn manager instance
SpawnManager = new NetworkSpawnManager(this);
Expand Down Expand Up @@ -862,6 +857,16 @@ private void Initialize(bool server)
NetworkConfig.NetworkTransport.Initialize(this);
}

private void ClearClients()
{
PendingClients.Clear();
m_ConnectedClients.Clear();
m_ConnectedClientsList.Clear();
m_ConnectedClientIds.Clear();
LocalClient = null;
NetworkObject.OrphanChildren.Clear();
}

/// <summary>
/// Starts a server
/// </summary>
Expand Down Expand Up @@ -1301,6 +1306,8 @@ internal void ShutdownInternal()
IsListening = false;
m_ShuttingDown = false;
m_StopProcessingMessages = false;

ClearClients();
}

// INetworkUpdateSystem
Expand Down