fixes

Author: EmandM

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

@@ -1280,13 +1280,7 @@ public SceneEventProgressStatus UnloadScene(Scene scene)
                 }
             }
 
-            sceneEventProgress.LoadSceneMode = LoadSceneMode.Additive;
-
-            // Any NetworkObjects marked to not be destroyed with a scene and reside within the scene about to be unloaded
-            // should be migrated temporarily into the DDOL, once the scene is unloaded they will be migrated into the
-            // currently active scene.
             var networkManager = NetworkManager;
-            SceneManagerHandler.MoveObjectsFromSceneToDontDestroyOnLoad(ref networkManager, scene);
 
             var sceneEventData = BeginSceneEvent();
             sceneEventData.SceneEventProgressId = sceneEventProgress.Guid;
@@ -1297,10 +1291,16 @@ public SceneEventProgressStatus UnloadScene(Scene scene)
 
             // This will be the message we send to everyone when this scene event sceneEventProgress is complete
             sceneEventProgress.SceneEventType = SceneEventType.UnloadEventCompleted;
+            sceneEventProgress.LoadSceneMode = LoadSceneMode.Additive;
 
             sceneEventProgress.SceneEventId = sceneEventData.SceneEventId;
             sceneEventProgress.OnSceneEventCompleted = OnSceneUnloaded;
 
+            // Any NetworkObjects marked to not be destroyed with a scene and reside within the scene about to be unloaded
+            // should be migrated temporarily into the DDOL, once the scene is unloaded they will be migrated into the
+            // currently active scene.
+            SceneManagerHandler.MoveObjectsFromSceneToDontDestroyOnLoad(ref networkManager, scene);
+
             if (!RemoveServerClientSceneHandle(sceneEventData.SceneHandle, scene.handle))
             {
                 Debug.LogError($"Failed to remove {SceneNameFromHash(sceneEventData.SceneHash)} scene handles [Server ({sceneEventData.SceneHandle})][Local({scene.handle})]");
@@ -2831,6 +2831,27 @@ internal bool IsSceneEventInProgress()
             return false;
         }
 
+        internal bool IsSceneUnloading(NetworkObject networkObject)
+        {
+            if (!NetworkManager.NetworkConfig.EnableSceneManagement)
+            {
+                return false;
+            }
+
+            foreach (var sceneEventEntry in SceneEventProgressTracking)
+            {
+                var name = SceneNameFromHash(sceneEventEntry.Value.SceneHash);
+                var scene = SceneManager.GetSceneByName(name);
+                var sameScene = name == networkObject.gameObject.scene.name && scene.handle == networkObject.SceneOriginHandle;
+
+                if (!sceneEventEntry.Value.HasTimedOut() && sceneEventEntry.Value.IsUnloading() && sceneEventEntry.Value.Status == SceneEventProgressStatus.Started && sameScene)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         /// <summary>
         /// Handles notifying clients when a NetworkObject has been migrated into a new scene
         /// </summary>

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

@@ -223,6 +223,14 @@ internal void ClientFinishedSceneEvent(ulong clientId)
             }
         }
 
+        /// <summary>
+        /// Returns whether the SceneEventType is related to an unloading event.
+        /// </summary>
+        internal bool IsUnloading()
+        {
+            return SceneEventType is SceneEventType.Unload or SceneEventType.UnloadComplete or SceneEventType.UnloadEventCompleted;
+        }
+
         /// <summary>
         /// Determines if the scene event has finished for both
         /// client(s) and server.

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

@@ -1607,25 +1607,20 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
             // We have to do this check first as subsequent checks assume we can access NetworkObjectId.
             if (!networkObject)
             {
-                Debug.LogWarning("Trying to destroy network object but it is null");
+                NetworkLog.LogWarning("Trying to destroy network object but it is null");
                 return;
             }
 
             // Removal of spawned object
             if (!SpawnedObjects.ContainsKey(networkObject.NetworkObjectId))
             {
-                if (!NetworkManager.ShutdownInProgress)
+                if (!NetworkManager.ShutdownInProgress && !NetworkManager.SceneManager.IsSceneEventInProgress())
                 {
-                    Debug.LogWarning($"Trying to destroy object {networkObject.NetworkObjectId} but it doesn't seem to exist anymore!");
+                    NetworkLog.LogWarning($"Trying to destroy object {networkObject.NetworkObjectId} but it doesn't seem to exist anymore!");
                 }
                 return;
             }
 
-            if (destroyGameObject && networkObject.IsSceneObject == true && NetworkLog.CurrentLogLevel <= LogLevel.Developer)
-            {
-                Debug.LogWarning("Destroying in-scene network objects can lead to unexpected behavior. It is recommended to use NetworkObject.Despawn(false) instead.");
-            }
-
             var distributedAuthority = NetworkManager.DistributedAuthorityMode;
             var hasDAAuthority = distributedAuthority && (networkObject.HasAuthority || (NetworkManager.DAHost && authorityOverride));
             var hasClientServerAuthority = !distributedAuthority && NetworkManager.IsServer;
@@ -1635,6 +1630,11 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
             // and only attempt to remove the child's parent on the server-side
             if (!NetworkManager.ShutdownInProgress && hasAuthority)
             {
+                if (destroyGameObject && networkObject.IsSceneObject == true && !NetworkManager.SceneManager.IsSceneUnloading(networkObject))
+                {
+                    NetworkLog.LogWarning("Destroying in-scene network objects can lead to unexpected behavior. It is recommended to use NetworkObject.Despawn(false) instead.");
+                }
+
                 // Get all child NetworkObjects
                 var objectsToRemoveParent = networkObject.GetComponentsInChildren<NetworkObject>();
 

testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObject.meta

@@ -6,18 +6,18 @@
 
 namespace TestProject.RuntimeTests
 {
-    public class InScenePlacedNetworkObjectBase : IntegrationTestWithApproximation
+    public class InSceneObjectBase : IntegrationTestWithApproximation
     {
         protected override int NumberOfClients => 2;
 
         internal const string SceneToLoad = "InSceneNetworkObject";
         private Scene m_AuthoritySideSceneLoaded;
         private Scene m_PreviousSceneLoaded;
 
-        protected InScenePlacedNetworkObjectBase(NetworkTopologyTypes networkTopologyType, HostOrServer hostOrServer) : base(networkTopologyType, hostOrServer) { }
+        protected InSceneObjectBase(NetworkTopologyTypes networkTopologyType, HostOrServer hostOrServer) : base(networkTopologyType, hostOrServer) { }
 
         // Constructor that is used by InScenePlacedNetworkObjectDestroyTests
-        protected InScenePlacedNetworkObjectBase(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+        protected InSceneObjectBase(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
 
         protected override IEnumerator OnSetup()
         {
@@ -36,6 +36,7 @@ protected override IEnumerator OnSetup()
         protected override IEnumerator OnTearDown()
         {
             GetAuthorityNetworkManager().SceneManager.OnSceneEvent -= OnSceneEvent;
+            NetworkObjectTestComponent.Reset();
             yield return CleanUpLoadedScene();
         }
 

testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObjectBase.cs renamed to testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObject/InSceneObjectBase.cs

@@ -15,13 +15,13 @@ namespace TestProject.RuntimeTests
     [TestFixture(NetworkTopologyTypes.DistributedAuthority, DespawnMode.Despawn)]
     [TestFixture(NetworkTopologyTypes.DistributedAuthority, DespawnMode.DeferDespawn)]
     [TestFixture(NetworkTopologyTypes.ClientServer, DespawnMode.Despawn)]
-    public class InScenePlacedNetworkObjectDestroyTests : InScenePlacedNetworkObjectBase
+    public class InSceneObjectDestroyTests : InSceneObjectBase
     {
         protected override int NumberOfClients => 2;
 
         private readonly DespawnMode m_DespawnMode;
 
-        public InScenePlacedNetworkObjectDestroyTests(NetworkTopologyTypes networkTopologyType, DespawnMode despawnMode) : base(networkTopologyType)
+        public InSceneObjectDestroyTests(NetworkTopologyTypes networkTopologyType, DespawnMode despawnMode) : base(networkTopologyType)
         {
             m_DespawnMode = despawnMode;
         }
@@ -95,6 +95,16 @@ private IEnumerator LoadSceneAndDespawnObject(DestroyMode destroyMode)
                 serverObject.DeferDespawn(1, destroyGameObject);
             }
 
+            const string expectedLog = "[Netcode] Destroying in-scene network objects can lead to unexpected behavior. It is recommended to use NetworkObject.Despawn(false) instead.";
+            if (destroyGameObject)
+            {
+                NetcodeLogAssert.LogWasReceived(LogType.Warning, expectedLog);
+            }
+            else
+            {
+                NetcodeLogAssert.LogWasNotReceived(LogType.Warning, expectedLog);
+            }
+
             yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == 0);
             AssertOnTimeout($"Timed out waiting for all in-scene instances to be despawned!  Current spawned count: {NetworkObjectTestComponent.SpawnedInstances.Count()}");
 

testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObjectBase.cs.meta renamed to testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObject/InSceneObjectBase.cs.meta

@@ -12,14 +12,14 @@ namespace TestProject.RuntimeTests
     [TestFixture(NetworkTopologyTypes.DistributedAuthority, HostOrServer.DAHost)]
     [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Host)]
     [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Server)]
-    public class InScenePlacedNetworkObjectParentingTests : InScenePlacedNetworkObjectBase
+    public class InSceneObjectParentingTests : InSceneObjectBase
     {
         protected override int NumberOfClients => 2;
 
         private const string k_InSceneUnder = "InSceneUnderGameObject";
         private const string k_InSceneUnderWithNetworkTransform = "InSceneUnderGameObjectWithNT";
 
-        public InScenePlacedNetworkObjectParentingTests(NetworkTopologyTypes networkTopologyType, HostOrServer hostOrServer) : base(networkTopologyType, hostOrServer) { }
+        public InSceneObjectParentingTests(NetworkTopologyTypes networkTopologyType, HostOrServer hostOrServer) : base(networkTopologyType, hostOrServer) { }
 
         [UnityTest]
         public IEnumerator ParentedInSceneObjectLateJoiningClient()