Merge pull request #651 from Unity-Technologies/fix/destroyobjectspam

mattwalsh-unity · web-flow · commit 5a5fc0557619 · 2021-03-23T09:52:57.000-07:00
fix: destroy object spam
diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs
@@ -361,7 +361,7 @@ public static void NetworkHide(List<NetworkObject> networkObjects, ulong clientI
 
         private void OnDestroy()
         {
-            if (NetworkManager.Singleton != null)
+            if (NetworkManager.Singleton != null && NetworkSpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId))
             {
                 NetworkSpawnManager.OnDestroyObject(NetworkObjectId, false);
             }

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ public static void NetworkHide(List<NetworkObject> networkObjects, ulong clientI`
`361`	`361`
`362`	`362`	`private void OnDestroy()`
`363`	`363`	`{`
`364`		`- if (NetworkManager.Singleton != null)`
	`364`	`+ if (NetworkManager.Singleton != null && NetworkSpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId))`
`365`	`365`	`{`
`366`	`366`	`NetworkSpawnManager.OnDestroyObject(NetworkObjectId, false);`
`367`	`367`	`}`