move spawn setup into NetworkObject.SetupOnSpawn

Author: noellie-velez

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

@@ -2001,7 +2001,6 @@ public NetworkObject InstantiateAndSpawn(NetworkManager networkManager, ulong ow
         public void Spawn(bool destroyWithScene = false)
         {
             var clientId = NetworkManager.DistributedAuthorityMode ? NetworkManager.LocalClientId : NetworkManager.ServerClientId;
-            m_HasAuthority = NetworkManager.DistributedAuthorityMode ? OwnerClientId == NetworkManager.LocalClientId : NetworkManager.IsServer;
             SpawnInternal(destroyWithScene, clientId, false);
         }
 
@@ -2053,6 +2052,72 @@ public void Despawn(bool destroy = true)
             NetworkManagerOwner.SpawnManager.DespawnObject(this, destroy);
         }
 
+        internal void SetupOnSpawn(ulong networkId, bool sceneObject, bool playerObject, ulong ownerClientId, bool destroyWithScene)
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            // Obsolete with warning means we need the underlying behaviour to keep existing
+            // TODO: remove in the 3.x branch
+            SetSceneObjectStatus(sceneObject);
+#pragma warning restore CS0618 // Type or member is obsolete
+
+            // Always check to make sure our scene of origin is properly set for in-scene placed NetworkObjects
+            // Note: Always check SceneOriginHandle directly at this specific location.
+            if (InScenePlaced && SceneOriginHandle.IsEmpty())
+            {
+                SceneOrigin = gameObject.scene;
+            }
+
+            NetworkObjectId = networkId;
+
+            DestroyWithScene = sceneObject || destroyWithScene;
+
+            IsPlayerObject = playerObject;
+
+            OwnerClientId = ownerClientId;
+
+            // When spawned, previous owner is always the first assigned owner
+            PreviousOwnerId = ownerClientId;
+
+            // If this is the player and the client is the owner, then lock ownership by default
+            if (NetworkManagerOwner.DistributedAuthorityMode && NetworkManagerOwner.LocalClientId == ownerClientId && playerObject)
+            {
+                AddOwnershipExtended(OwnershipStatusExtended.Locked);
+            }
+
+            m_HasAuthority = NetworkManagerOwner.DistributedAuthorityMode ? OwnerClientId == NetworkManagerOwner.LocalClientId : NetworkManagerOwner.IsServer;
+            IsSpawned = true;
+
+            // If we are not running in DA mode, this is the server, and the NetworkObject has SpawnWithObservers set,
+            // then add all connected clients as observers
+            if (!NetworkManagerOwner.DistributedAuthorityMode && NetworkManagerOwner.IsServer && SpawnWithObservers)
+            {
+                // If running as a server only, then make sure to always add the server's client identifier
+                if (!NetworkManagerOwner.IsHost)
+                {
+                    AddObserver(NetworkManagerOwner.LocalClientId);
+                }
+
+                // Add client observers
+                for (int i = 0; i < NetworkManagerOwner.ConnectedClientsIds.Count; i++)
+                {
+                    // If CheckObjectVisibility has a callback, then allow that method determine who the observers are.
+                    if (CheckObjectVisibility != null && !CheckObjectVisibility(NetworkManagerOwner.ConnectedClientsIds[i]))
+                    {
+                        continue;
+                    }
+                    AddObserver(NetworkManagerOwner.ConnectedClientsIds[i]);
+                }
+            }
+
+            // If we are an in-scene placed NetworkObject and our InScenePlacedSourceGlobalObjectIdHash is set
+            // then assign this to the PrefabGlobalObjectIdHash
+            if (InScenePlaced && InScenePlacedSourceGlobalObjectIdHash != 0)
+            {
+                PrefabGlobalObjectIdHash = InScenePlacedSourceGlobalObjectIdHash;
+            }
+
+        }
+
         internal void ResetOnDespawn()
         {
             // Always clear out the observers list when despawned
@@ -2118,7 +2183,10 @@ internal void InvokeBehaviourOnOwnershipChanged(ulong originalOwnerClientId, ulo
             var isPreviousOwner = originalOwnerClientId == NetworkManagerOwner.LocalClientId;
             var isNewOwner = newOwnerClientId == NetworkManagerOwner.LocalClientId;
 
-            m_HasAuthority = distributedAuthorityMode ? OwnerClientId == NetworkManagerOwner.LocalClientId : NetworkManagerOwner.IsServer;
+            if (distributedAuthorityMode)
+            {
+                m_HasAuthority = isNewOwner;
+            }
 
             if (distributedAuthorityMode || isPreviousOwner)
             {

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

@@ -1295,9 +1295,10 @@ internal bool NonAuthorityLocalSpawn(in NetworkObject.SerializedObject serialize
         }
 
         /// <summary>
-        /// Handles the all the final setup and spawning needed for
+        /// Handles all the final setup and spawning needed for spawning a NetworkObject locally.
         /// </summary>
-        /// <returns>boolean indicating whether the spawn succeeded. Internal dev note: THIS IS A CATCH FOR OURSELVES. DON'T PULL OUT</returns>
+        /// <returns>boolean indicating whether the spawn succeeded.</returns>
+        //  Internal dev note: THIS IS A CATCH FOR OURSELVES. DON'T PULL OUT
         internal bool SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong ownerClientId, bool destroyWithScene)
         {
             // TODO: Replace the following checks with internal Netcode asserts
@@ -1311,7 +1312,7 @@ internal bool SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong
                 return false;
             }
 
-            if (networkId == default)
+            if (networkId == 0)
             {
                 if (NetworkManager.LogLevel <= LogLevel.Error)
                 {
@@ -1320,70 +1321,18 @@ internal bool SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong
                 return false;
             }
 
-#pragma warning disable CS0618 // Type or member is obsolete
-            // Obsolete with warning means we need the underlying behaviour to keep existing
-            // TODO: remove in the 3.x branch
-            networkObject.SetSceneObjectStatus(sceneObject);
-#pragma warning restore CS0618 // Type or member is obsolete
+            networkObject.SetupOnSpawn(networkId, sceneObject, playerObject, ownerClientId, destroyWithScene);
 
-            // Always check to make sure our scene of origin is properly set for in-scene placed NetworkObjects
-            // Note: Always check SceneOriginHandle directly at this specific location.
-            if (networkObject.InScenePlaced && networkObject.SceneOriginHandle.IsEmpty())
-            {
-                networkObject.SceneOrigin = networkObject.gameObject.scene;
-            }
-
-            networkObject.NetworkObjectId = networkId;
-
-            networkObject.DestroyWithScene = sceneObject || destroyWithScene;
-
-            networkObject.IsPlayerObject = playerObject;
-
-            networkObject.OwnerClientId = ownerClientId;
-
-            // When spawned, previous owner is always the first assigned owner
-            networkObject.PreviousOwnerId = ownerClientId;
-
-            // If this the player and the client is the owner, then lock ownership by default
-            if (NetworkManager.DistributedAuthorityMode && NetworkManager.LocalClientId == ownerClientId && playerObject)
-            {
-                networkObject.AddOwnershipExtended(NetworkObject.OwnershipStatusExtended.Locked);
-            }
-
-            networkObject.IsSpawned = true;
             SpawnedObjects.Add(networkObject.NetworkObjectId, networkObject);
             SpawnedObjectsList.Add(networkObject);
-
-            // If we are not running in DA mode, this is the server, and the NetworkObject has SpawnWithObservers set,
-            // then add all connected clients as observers
-            if (!NetworkManager.DistributedAuthorityMode && NetworkManager.IsServer && networkObject.SpawnWithObservers)
-            {
-                // If running as a server only, then make sure to always add the server's client identifier
-                if (!NetworkManager.IsHost)
-                {
-                    networkObject.AddObserver(NetworkManager.LocalClientId);
-                }
-
-                // Add client observers
-                for (int i = 0; i < NetworkManager.ConnectedClientsIds.Count; i++)
-                {
-                    // If CheckObjectVisibility has a callback, then allow that method determine who the observers are.
-                    if (networkObject.CheckObjectVisibility != null && !networkObject.CheckObjectVisibility(NetworkManager.ConnectedClientsIds[i]))
-                    {
-                        continue;
-                    }
-                    networkObject.AddObserver(NetworkManager.ConnectedClientsIds[i]);
-                }
-            }
-
             networkObject.ApplyNetworkParenting();
+
             NetworkObject.CheckOrphanChildren();
 
             AddNetworkObjectToSceneChangedUpdates(networkObject);
 
             networkObject.InvokeBehaviourNetworkSpawn();
 
-
             // Only dynamically spawned NetworkObjects are allowed
             if (!sceneObject)
             {
@@ -1395,13 +1344,6 @@ internal bool SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong
                 UpdateNetworkClientPlayer(networkObject);
             }
 
-            // If we are an in-scene placed NetworkObject and our InScenePlacedSourceGlobalObjectIdHash is set
-            // then assign this to the PrefabGlobalObjectIdHash
-            if (networkObject.InScenePlaced && networkObject.InScenePlacedSourceGlobalObjectIdHash != 0)
-            {
-                networkObject.PrefabGlobalObjectIdHash = networkObject.InScenePlacedSourceGlobalObjectIdHash;
-            }
-
             return true;
         }