Ensure spawn count is reset on NetworkManager shutdown

Author: EmandM

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

@@ -1872,7 +1872,7 @@ private void SpawnInternal(bool destroyWithScene, ulong ownerClientId, bool play
             // The scene object was never automatically spawned when the scene was loaded.
             // Count this object as a dynamically spawned object.
             // TODO-[MTT-15388]: Actually support disabled/not spawned InScenePlaced NetworkObjects
-            if (InScenePlaced && m_SpawnCount == 0)
+            if (InScenePlaced && !HasBeenSpawned)
             {
                 if (NetworkManagerOwner.NetworkConfig.EnableSceneManagement && NetworkManagerOwner.LogLevel <= LogLevel.Developer)
                 {
@@ -2124,6 +2124,17 @@ internal void SetupOnSpawn(ulong networkId, bool isPlayerObject, ulong ownerClie
             }
         }
 
+        /// <summary>
+        /// Resets this NetworkObject at the end of a session.
+        /// Ensures scene objects are ready to be reused
+        /// </summary>
+        internal void ResetOnShutdown()
+        {
+            NetworkLog.InternalAssert(NetworkManager.ShutdownInProgress, "This method should only be called while the NetworkManager is shutting down");
+            m_SpawnCount = 0;
+            ResetOnDespawn();
+        }
+
         internal void ResetOnDespawn()
         {
             // Always clear out the observers list when despawned

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

@@ -1446,13 +1446,12 @@ internal void DespawnObject(NetworkObject networkObject, bool destroyObject = fa
         internal void ServerResetShutdownStateForSceneObjects()
         {
             var networkObjects = FindObjects.ByType<NetworkObject>(orderByIdentifier: true, includeInactive: true);
-            foreach (var sobj in networkObjects)
+            foreach (var obj in networkObjects)
             {
-                if (!sobj.InScenePlaced)
+                if (obj.HasBeenSpawned)
                 {
-                    continue;
+                    obj.ResetOnShutdown();
                 }
-                sobj.ResetOnDespawn();
             }
         }
 

com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerSynchronizationTests.cs

@@ -46,8 +46,7 @@ public IEnumerator NetworkPrefabHandlerSpawnAndSynchronizeTests()
             LogAssert.Expect(LogType.Error, new Regex("Failed to spawn NetworkObject!"));
             // Authority should receive an error from non-authority and should use the globalObjectIdHash to find the failing object
             LogAssert.Expect(LogType.Error, new Regex($@"SenderId:{nonAuthority.LocalClientId}\]\[{Regex.Escape(exceptionObject.name)}"));
-            // LogAssert.Expect(LogType.Error, new Regex(Regex.Escape(exceptionObject.name)));
-            // LogAssert.Expect(LogType.Error, "[Netcode] [Received log from client][SenderId:1][ClientSideExceptionPrefab{3}-OnServer{0}][NetworkObjectId:3] [NonAuthorityLocalSpawn][GlobalObjectIdHash:111115] Failed to spawn NetworkObject!");
+
             yield return WaitForConditionOrTimeOut(() => exceptionObject.IsSpawned);
             AssertOnTimeout("Failed to spawn object on authority!");