Fix onStartSweep

Author: EmandM

com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs

@@ -805,7 +805,6 @@ internal void HandleConnectionApproval(ulong ownerClientId, NetworkManager.Conne
                     // Spawn the player NetworkObject locally
                     NetworkManager.SpawnManager.SpawnNetworkObjectLocally(
                         playerObject,
-                        NetworkManager,
                         NetworkManager.SpawnManager.GetNetworkObjectId(),
                         sceneObject: false,
                         playerObject: true,

com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

@@ -1827,7 +1827,7 @@ internal void SpawnInternal(bool destroyWithScene, ulong ownerClientId, bool pla
                 }
             }
 
-            NetworkManager.SpawnManager.SpawnNetworkObjectLocally(this, NetworkManagerOwner, NetworkManager.SpawnManager.GetNetworkObjectId(), IsSceneObject.HasValue && IsSceneObject.Value, playerObject, ownerClientId, destroyWithScene);
+            NetworkManager.SpawnManager.SpawnNetworkObjectLocally(this, NetworkManager.SpawnManager.GetNetworkObjectId(), IsSceneObject.HasValue && IsSceneObject.Value, playerObject, ownerClientId, destroyWithScene);
 
             if ((NetworkManager.DistributedAuthorityMode && NetworkManager.DAHost) || (!NetworkManager.DistributedAuthorityMode && NetworkManager.IsServer))
             {

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

@@ -1822,7 +1822,7 @@ private void OnSessionOwnerLoadedScene(uint sceneEventId, Scene scene)
                     if (!keyValuePairBySceneHandle.Value.IsPlayerObject)
                     {
                         // All in-scene placed NetworkObjects default to being owned by the server
-                        NetworkManager.SpawnManager.SpawnNetworkObjectLocally(keyValuePairBySceneHandle.Value, NetworkManager,
+                        NetworkManager.SpawnManager.SpawnNetworkObjectLocally(keyValuePairBySceneHandle.Value,
                             NetworkManager.SpawnManager.GetNetworkObjectId(), true, false, NetworkManager.LocalClientId, true);
                     }
                 }

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

@@ -377,7 +377,7 @@ internal void AddDespawnedInSceneNetworkObjects()
             foreach (var sobj in inSceneNetworkObjects)
             {
                 // For integration tests, don't collect objects that don't belong to us.
-                if (sobj.NetworkManagerOwner != null && sobj.NetworkManagerOwner != m_NetworkManager)
+                if (sobj.NetworkManager != m_NetworkManager)
                 {
                     continue;
                 }

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

@@ -1030,7 +1030,7 @@ internal NetworkObject CreateLocalNetworkObject(NetworkObject.SceneObject sceneO
         /// Distributed Authority:
         /// DAHost client and standard DA clients invoke this method.
         /// </summary>
-        internal void SpawnNetworkObjectLocally(NetworkObject networkObject, NetworkManager networkManager, ulong networkId, bool sceneObject, bool playerObject, ulong ownerClientId, bool destroyWithScene)
+        internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong ownerClientId, bool destroyWithScene)
         {
             if (networkObject == null)
             {
@@ -1051,12 +1051,9 @@ internal void SpawnNetworkObjectLocally(NetworkObject networkObject, NetworkMana
                     Debug.LogError("Spawning NetworkObjects with nested NetworkObjects is only supported for scene objects. Child NetworkObjects will not be spawned over the network!");
                 }
             }
+
             // Invoke NetworkBehaviour.OnPreSpawn methods
-            if (networkObject.NetworkManagerOwner != networkManager || NetworkManager != networkManager)
-            {
-                Debug.LogWarning("overriding network manager");
-            }
-            networkObject.NetworkManagerOwner = networkManager;
+            networkObject.NetworkManagerOwner = NetworkManager;
             networkObject.InvokeBehaviourNetworkPreSpawn();
 
             // DANGO-TODO: It would be nice to allow users to specify which clients are observers prior to spawning
@@ -1103,6 +1100,11 @@ internal void SpawnNetworkObjectLocally(NetworkObject networkObject, NetworkMana
 
         internal void SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong ownerClientId, bool destroyWithScene)
         {
+            if (networkObject.NetworkManagerOwner == null)
+            {
+                Debug.LogError("NetworkManagerOwner should not be null!");
+            }
+
             if (SpawnedObjects.ContainsKey(networkId))
             {
                 Debug.LogWarning($"[{NetworkManager.name}] Trying to spawn {networkObject.name} with a {nameof(NetworkObject.NetworkObjectId)} of {networkId} but it is already in the spawned list!");
@@ -1471,25 +1473,25 @@ internal void ServerSpawnSceneObjectsOnStartSweep()
             var networkObjects = UnityEngine.Object.FindObjectsOfType<NetworkObject>();
 #endif
             var networkObjectsToSpawn = new List<NetworkObject>();
-            for (int i = 0; i < networkObjects.Length; i++)
+            foreach (var networkObject in networkObjects)
             {
-                if (networkObjects[i].NetworkManager != NetworkManager)
+                if (networkObject.NetworkManager != NetworkManager)
                 {
-                    Debug.LogWarning("Well this is strange");
+                    continue;
                 }
                 // This used to be two loops.
                 // The first added all NetworkObjects to a list and the second spawned all NetworkObjects in the list.
                 // Now, a parent will set its children's IsSceneObject value when spawned, so we check for null or for true.
-                if (networkObjects[i].IsSceneObject == null || (networkObjects[i].IsSceneObject.HasValue && networkObjects[i].IsSceneObject.Value))
+                if (networkObject.IsSceneObject == null || (networkObject.IsSceneObject.HasValue && networkObject.IsSceneObject.Value))
                 {
-                    var ownerId = networkObjects[i].OwnerClientId;
+                    var ownerId = networkObject.OwnerClientId;
                     if (NetworkManager.DistributedAuthorityMode)
                     {
                         ownerId = NetworkManager.LocalClientId;
                     }
 
-                    SpawnNetworkObjectLocally(networkObjects[i], NetworkManager, GetNetworkObjectId(), true, false, ownerId, true);
-                    networkObjectsToSpawn.Add(networkObjects[i]);
+                    SpawnNetworkObjectLocally(networkObject, GetNetworkObjectId(), true, false, ownerId, true);
+                    networkObjectsToSpawn.Add(networkObject);
                 }
             }