fix

Fixing the issue where destroy with scene could cause errors on non-authority instances.

Author: NoelStephensUnity

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

@@ -1717,6 +1717,14 @@ private void OnDestroy()
             // Authority is the server (client-server) and the owner or DAHost (distributed authority) when destroying a NetworkObject
             var isAuthority = HasAuthority || NetworkManager.DAHost;
 
+            // 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 &&
                 (IsSceneObject == null || (IsSceneObject.Value != true)))
             {
@@ -1727,6 +1735,7 @@ 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/NetworkSceneManager.cs

@@ -1,3 +1,4 @@
+using Codice.CM.Common.Tree.Partial;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -2823,6 +2824,44 @@ 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>