Update object destroying on resynchronize

Author: EmandM

com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs

@@ -919,6 +919,7 @@ internal void ReadClientReSynchronizationData(FastBufferReader reader)
                 var networkObjectIdToNetworkObject = new Dictionary<ulong, NetworkObject>();
                 foreach (var networkObject in networkObjects)
                 {
+                    // If the NetworkObject isn't spawned then we don't need to destroy it
                     if (networkObject.IsSpawned)
                     {
                         networkObjectIdToNetworkObject.TryAdd(networkObject.NetworkObjectId, networkObject);
@@ -927,28 +928,13 @@ internal void ReadClientReSynchronizationData(FastBufferReader reader)
 
                 foreach (var networkObjectId in networkObjectsToRemove)
                 {
-                    if (networkObjectIdToNetworkObject.ContainsKey(networkObjectId))
+                    if (networkObjectIdToNetworkObject.TryGetValue(networkObjectId, out var networkObject))
                     {
-                        var networkObject = networkObjectIdToNetworkObject[networkObjectId];
-                        networkObjectIdToNetworkObject.Remove(networkObjectId);
-
-                        networkObject.IsSpawned = false;
-                        if (m_NetworkManager.PrefabHandler.ContainsHandler(networkObject))
-                        {
-                            if (m_NetworkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId))
-                            {
-                                m_NetworkManager.SpawnManager.SpawnedObjects.Remove(networkObjectId);
-                            }
-                            if (m_NetworkManager.SpawnManager.SpawnedObjectsList.Contains(networkObject))
-                            {
-                                m_NetworkManager.SpawnManager.SpawnedObjectsList.Remove(networkObject);
-                            }
-                            m_NetworkManager.PrefabHandler.HandleNetworkPrefabDestroy(networkObject);
-                        }
-                        else
+                        if (m_NetworkManager.LogLevel <= LogLevel.Developer)
                         {
-                            UnityEngine.Object.DestroyImmediate(networkObject.gameObject);
+                            NetworkLog.LogWarning($"[ReadClientReSynchronizationData][{networkObject.name}] Despawning and destroying {nameof(NetworkObject)}.");
                         }
+                        m_NetworkManager.SpawnManager.OnDespawnObject(networkObject, true, true);
                     }
                 }
             }

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs

@@ -1287,6 +1287,8 @@ internal bool NonAuthorityLocalSpawn(in NetworkObject.SerializedObject serialize
         /// <returns>boolean indicating whether the spawn succeeded. Internal dev note: THIS IS A CATCH FOR OURSELVES. DON'T PULL OUT</returns>
         internal bool SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong ownerClientId, bool destroyWithScene)
         {
+            // TODO: Replace the following checks with internal Netcode asserts
+            // We want our tests to double check this without impacting users.
             if (networkObject.NetworkManagerOwner == null)
             {
                 if (NetworkManager.LogLevel <= LogLevel.Error)
@@ -1296,6 +1298,15 @@ internal bool SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong
                 return false;
             }
 
+            if (networkObject.NetworkObjectId == default)
+            {
+                if (NetworkManager.LogLevel <= LogLevel.Error)
+                {
+                    NetworkLog.LogError($"[{networkObject.name}] Trying to spawn {nameof(NetworkObject)} with invalid {nameof(NetworkObject.NetworkObjectId)} {networkObject.NetworkObjectId}. This should not happen!");
+                }
+                return false;
+            }
+
             networkObject.IsSceneObject = sceneObject;
 
             // Always check to make sure our scene of origin is properly set for in-scene placed NetworkObjects
@@ -1725,23 +1736,13 @@ internal void OnDespawnNonAuthorityObject([NotNull] NetworkObject networkObject,
         /// <param name="networkObject">The <see cref="NetworkObject"/> to despawn.</param>
         /// <param name="destroyGameObject">Whether to destroy the underlying game object, or to simply despawn the object.</param>
         /// <param name="authorityOverride">Gives the DAHost server permissions. Otherwise, DAHost only has authority on objects it owns.</param>
-        internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObject, bool authorityOverride = false)
+        internal void OnDespawnObject([NotNull] NetworkObject networkObject, bool destroyGameObject, bool authorityOverride = false)
         {
             if (!NetworkManager)
             {
                 return;
             }
 
-            // We have to do this check first as subsequent checks assume we can access NetworkObjectId.
-            if (!networkObject)
-            {
-                if (NetworkManager.LogLevel <= LogLevel.Normal)
-                {
-                    NetworkLog.LogWarning("Trying to destroy network object but it is null");
-                }
-                return;
-            }
-
             // Removal of spawned object
             if (!SpawnedObjects.ContainsKey(networkObject.NetworkObjectId))
             {