charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetworkServer.UpdateServerObjects doesn't remove null values anymore because there shouldn't be any

Browse Source
This commit is contained in:
vis2k 2018-12-17 21:04:23 +01:00
parent b0f51aeba0
commit 99f2d956bb
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Mirror/Runtime/NetworkServer.cs
View File

@ -309,10 +309,7 @@ internal static void Update()
static void UpdateServerObjects()
{
// vis2k: original code only removed null entries every 100 frames. this was unnecessarily complicated and
// probably even slower than removing null entries each time (hence less iterations next time).
List<uint> removeNetIds = new List<uint>();
foreach (var kvp in NetworkIdentity.spawned)
foreach (KeyValuePair<uint, NetworkIdentity> kvp in NetworkIdentity.spawned)
{
if (kvp.Value != null && kvp.Value.gameObject != null)
{
@ -320,15 +317,11 @@ static void UpdateServerObjects()
}
else
{
removeNetIds.Add(kvp.Key);
// spawned list should have no null entries because we
// always call Remove in OnObjectDestroy everywhere.
Debug.LogWarning("Found 'null' entry in spawned list for netId=" + kvp.Key + ". Please call NetworkServer.Destroy to destroy networked objects. Don't use GameObject.Destroy.");
}
}
// now remove
foreach (uint netId in removeNetIds)
{
NetworkIdentity.spawned.Remove(netId);
}
}
internal static void InternalUpdate()