refactor

Refactoring my approach.

Author: NoelStephensUnity

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

@@ -1194,6 +1194,7 @@ public void SetSceneObjectStatus(bool isSceneObject = false)
         /// Gets whether or not the object should be automatically removed when the scene is unloaded.
         /// </summary>
         public bool DestroyWithScene { get; set; }
+        internal bool DestroyPendingSceneEvent;
 
         /// <summary>
         /// When set to true and the active scene is changed, this will automatically migrate the <see cref="NetworkObject"/>
@@ -1714,18 +1715,11 @@ private void OnDestroy()
                 return;
             }
 
-            // Authority is the server (client-server) and the owner or DAHost (distributed authority) when destroying a NetworkObject
-            var isAuthority = HasAuthority || NetworkManager.DAHost;
+            // An authoritzed destroy is when it is happening on the authority instance or it is being destroyed due to
+            // a scene event that will automatically destroy any NetworkObject instances that should be destroyed with the scene.
+            var isAuthorityDestroy = HasAuthority || NetworkManager.DAHost || DestroyPendingSceneEvent;
 
-            // If we are not the authority, check to see if this is one of the edge case scenarios where a NetworkObject could be getting
-            // destroyed due to unloading a scene or loading a scene in single mode.
-            if (!isAuthority && IsSpawned && NetworkManager.DistributedAuthorityMode && NetworkManager.NetworkConfig.EnableSceneManagement
-                && NetworkManager.SceneManager.ShouldObjectBeDestroyedWhenUnloaded(this))
-            {
-                isAuthority = true;
-            }
-
-            if (NetworkManager.IsListening && !isAuthority && IsSpawned &&
+            if (NetworkManager.IsListening && !isAuthorityDestroy && IsSpawned &&
                 (IsSceneObject == null || (IsSceneObject.Value != true)))
             {
                 // If we destroyed a GameObject with a NetworkObject component on the non-authority side, handle cleaning up the SceneMigrationSynchronization.
@@ -1735,7 +1729,6 @@ private void OnDestroy()
                 // if this happens. Instead, we should just generate a network log error and exit early (as long as we are not shutting down).
                 if (!NetworkManager.ShutdownInProgress)
                 {
-
                     // Since we still have a session connection, log locally and on the server to inform user of this issue.
                     if (NetworkManager.LogLevel <= LogLevel.Error)
                     {

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

@@ -293,13 +293,20 @@ public void MoveObjectsFromSceneToDontDestroyOnLoad(ref NetworkManager networkMa
             // Create a local copy of the spawned objects list since the spawn manager will adjust the list as objects
             // are despawned.
             var localSpawnedObjectsHashSet = new HashSet<NetworkObject>(networkManager.SpawnManager.SpawnedObjectsList);
+            var distributedAuthority = networkManager.DistributedAuthorityMode;
             foreach (var networkObject in localSpawnedObjectsHashSet)
             {
                 if (networkObject == null || (networkObject != null && networkObject.gameObject.scene.handle != scene.handle))
                 {
                     continue;
                 }
 
+                // Check to determine if we need to allow destroying a non-authority instance
+                if (distributedAuthority && networkObject.DestroyWithScene && !networkObject.HasAuthority)
+                {
+                    networkObject.DestroyPendingSceneEvent = true;
+                }
+
                 // Only NetworkObjects marked to not be destroyed with the scene and are not already in the DDOL are preserved
                 if (!networkObject.DestroyWithScene && networkObject.gameObject.scene != networkManager.SceneManager.DontDestroyOnLoadScene)
                 {
@@ -309,7 +316,7 @@ public void MoveObjectsFromSceneToDontDestroyOnLoad(ref NetworkManager networkMa
                         UnityEngine.Object.DontDestroyOnLoad(networkObject.gameObject);
                     }
                 }
-                else if (networkManager.IsServer)
+                else if (networkObject.HasAuthority)
                 {
                     networkObject.Despawn();
                 }

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

@@ -2679,13 +2679,20 @@ internal void MoveObjectsToDontDestroyOnLoad()
             // Create a local copy of the spawned objects list since the spawn manager will adjust the list as objects
             // are despawned.
             var localSpawnedObjectsHashSet = new HashSet<NetworkObject>(NetworkManager.SpawnManager.SpawnedObjectsList);
+            var distributedAuthority = NetworkManager.DistributedAuthorityMode;
             foreach (var networkObject in localSpawnedObjectsHashSet)
             {
                 if (networkObject == null || (networkObject != null && networkObject.gameObject.scene == DontDestroyOnLoadScene))
                 {
                     continue;
                 }
 
+                // Check to determine if we need to allow destroying a non-authority instance
+                if (distributedAuthority && networkObject.DestroyWithScene && !networkObject.HasAuthority)
+                {
+                    networkObject.DestroyPendingSceneEvent = true;
+                }
+
                 // Only NetworkObjects marked to not be destroyed with the scene
                 if (!networkObject.DestroyWithScene)
                 {
@@ -2823,44 +2830,6 @@ internal bool IsSceneEventInProgress()
             return false;
         }
 
-        /// <summary>
-        /// Used to determine if it is valid for a distributed authority client to destroy a spawned object
-        /// based on any current scene event in progress and/or the GameObject's scene status.
-        /// <see cref="NetworkObject.OnDestroy"/>
-        /// </summary>
-        /// <param name="networkObject">the NetworkObject to check</param>
-        internal bool ShouldObjectBeDestroyedWhenUnloaded(NetworkObject networkObject)
-        {
-            if (!IsSceneEventInProgress())
-            {
-                return false;
-            }
-            if (!networkObject.gameObject.scene.isLoaded)
-            {
-                return networkObject.DestroyWithScene;
-            }
-            var objectScene = networkObject.gameObject.scene;
-            var objectSceneHash = SceneHashFromNameOrPath(objectScene.name);
-            foreach (var sceneEventEntry in SceneEventProgressTracking)
-            {
-                if (sceneEventEntry.Value.HasTimedOut())
-                {
-                    continue;
-                }
-                if (sceneEventEntry.Value.SceneEventType == SceneEventType.Unload && sceneEventEntry.Value.Status == SceneEventProgressStatus.Started
-                    && sceneEventEntry.Value.SceneHash == objectSceneHash)
-                {
-                    return networkObject.DestroyWithScene;
-                }
-                if (sceneEventEntry.Value.SceneEventType == SceneEventType.Load && sceneEventEntry.Value.LoadSceneMode == LoadSceneMode.Single &&
-                    sceneEventEntry.Value.SceneHash != objectSceneHash)
-                {
-                    return networkObject.DestroyWithScene;
-                }
-            }
-            return false;
-        }
-
         /// <summary>
         /// Handles notifying clients when a NetworkObject has been migrated into a new scene
         /// </summary>