Fix the fix

Author: EmandM

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

@@ -1443,10 +1443,7 @@ public bool IsNetworkVisibleTo(ulong clientId)
         /// </summary>
         internal Scene SceneOrigin
         {
-            get
-            {
-                return m_SceneOrigin;
-            }
+            get => m_SceneOrigin;
 
             set
             {
@@ -1466,13 +1463,8 @@ internal Scene SceneOrigin
         /// </summary>
         internal NetworkSceneHandle GetSceneOriginHandle()
         {
-            if (SceneOriginHandle.IsEmpty() && IsSpawned && InScenePlaced)
-            {
-                if (NetworkManager.LogLevel <= LogLevel.Error)
-                {
-                    NetworkLog.LogErrorServer($"{nameof(GetSceneOriginHandle)} called when {nameof(SceneOriginHandle)} is still zero but the {nameof(NetworkObject)} is already spawned!");
-                }
-            }
+            NetworkLog.InternalAssert(!(IsSpawned && InScenePlaced && SceneOriginHandle.IsEmpty()), $"Spawned in scene placed NetworkObject {name} should always have a valid SceneOriginHandle");
+
             return !SceneOriginHandle.IsEmpty() ? SceneOriginHandle : gameObject.scene.handle;
         }
 
@@ -2057,7 +2049,6 @@ internal void SetupOnSpawn(ulong networkId, bool isPlayerObject, ulong ownerClie
             NetworkObjectId = networkId;
             IsPlayerObject = isPlayerObject;
             OwnerClientId = ownerClientId;
-            m_IsOwner = ownerClientId == NetworkManagerOwner.LocalClientId;
             // When spawned, previous owner is always the first assigned owner
             PreviousOwnerId = ownerClientId;
             m_HasAuthority = NetworkManagerOwner.DistributedAuthorityMode ? OwnerClientId == NetworkManagerOwner.LocalClientId : NetworkManagerOwner.IsServer;

com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs

@@ -160,16 +160,11 @@ private static bool TryGetNetworkObjectName([NotNull] NetworkManager networkMana
             return true;
         }
 
+        [HideInCallstack]
         [Conditional("NETCODE_INTERNAL")]
         internal static void InternalAssert(bool condition, string message)
         {
             Assert.IsTrue(condition, message);
         }
-
-        [Conditional("NETCODE_CHECK_OWNERSHIP")]
-        internal static void OtherAssert(bool condition, string message)
-        {
-            Assert.IsTrue(condition, message);
-        }
     }
 }

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

@@ -1461,8 +1461,7 @@ internal void ServerResetShutdownStateForSceneObjects()
                 {
                     continue;
                 }
-                sobj.IsSpawned = false;
-                sobj.DestroyWithScene = false;
+                sobj.ResetOnDespawn();
             }
         }
 

com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs

@@ -341,7 +341,17 @@ bool HasConditionBeenMet()
             Assert.False(s_GlobalTimeoutHelper.TimedOut, "Timed out while waiting for client side despawns!");
 
             //----------- step 2 check spawn and destroy again
-            authorityInstance.GetComponent<NetworkObject>().Spawn();
+            var authorityObject = authorityInstance.GetComponent<NetworkObject>();
+            authorityObject.Spawn();
+
+            // This validates invoking GetSceneOriginHandle will not throw an exception for a dynamically spawned NetworkObject
+            // when the scene of origin hasn't been set.
+            var sceneOriginHandle = authorityObject.GetSceneOriginHandle();
+
+            // This validates that GetSceneOriginHandle will return the GameObject's scene handle that should be the currently active scene
+            var activeSceneHandle = SceneManager.GetActiveScene().handle;
+            Assert.IsTrue(sceneOriginHandle == activeSceneHandle, $"{nameof(NetworkObject)} should have returned the active scene handle of {activeSceneHandle} but returned {sceneOriginHandle}");
+
             // wait a tick
             yield return s_DefaultWaitForTick;
             // check spawned again on server this is 2 because we are reusing the object which was already spawned once.
@@ -366,22 +376,6 @@ bool HasConditionBeenMet()
             Assert.False(s_GlobalTimeoutHelper.TimedOut, "Timed out while waiting for client side despawns! (2nd pass)");
         }
 
-        [Test]
-        public void DynamicallySpawnedNoSceneOriginException()
-        {
-            var gameObject = new GameObject();
-            var networkObject = gameObject.AddComponent<NetworkObject>();
-            networkObject.IsSpawned = true;
-            networkObject.SceneOriginHandle = default;
-            // This validates invoking GetSceneOriginHandle will not throw an exception for a dynamically spawned NetworkObject
-            // when the scene of origin hasn't been set.
-            var sceneOriginHandle = networkObject.GetSceneOriginHandle();
-
-            // This validates that GetSceneOriginHandle will return the GameObject's scene handle that should be the currently active scene
-            var activeSceneHandle = SceneManager.GetActiveScene().handle;
-            Assert.IsTrue(sceneOriginHandle == activeSceneHandle, $"{nameof(NetworkObject)} should have returned the active scene handle of {activeSceneHandle} but returned {sceneOriginHandle}");
-        }
-
         private class TrackOnSpawnFunctions : NetworkBehaviour
         {
             public int OnNetworkSpawnCalledCount { get; private set; }