fix: In-scene placed NetworkObjects getting destroyed if early disconnect (up-port) (#2924)

* fix

up-port of #2923 fix for in-scene placed NetworkObjects getting destroyed if a client disconnects early.

* test

adding test to validate fix

* test fix

Fixing issue of checking HasAuthority via NetworkObject as opposed to NetworkBehaviour

Author: NoelStephensUnity

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -16,6 +16,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
+- Fixed issue where in-scene placed NetworkObjects could be destroyed if a client disconnects early and/or before approval. (#2924)
 - Fixed issue where a `NetworkObject` component's associated `NetworkBehaviour` components would not be detected if scene loading is disabled in the editor and the currently loaded scene has in-scene placed `NetworkObject`s. (#2912)
 - Fixed issue where an in-scene placed `NetworkObject` with `NetworkTransform` that is also parented under a `GameObject` would not properly synchronize when the parent `GameObject` had a world space position other than 0,0,0. (#2898)
 

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

@@ -1245,7 +1245,7 @@ internal void DespawnAndDestroyNetworkObjects()
                     {
                         // If it is an in-scene placed NetworkObject then just despawn and let it be destroyed when the scene
                         // is unloaded. Otherwise, despawn and destroy it.
-                        var shouldDestroy = !(networkObjects[i].IsSceneObject != null && networkObjects[i].IsSceneObject.Value);
+                        var shouldDestroy = !(networkObjects[i].IsSceneObject == null || (networkObjects[i].IsSceneObject != null && networkObjects[i].IsSceneObject.Value));
 
                         // If we are going to destroy this NetworkObject, check for any in-scene placed children that need to be removed
                         if (shouldDestroy)

testproject/Assets/Tests/Manual/InSceneObjectParentingTests/InSceneParentChildHandler.cs

@@ -132,7 +132,7 @@ private bool CheckForAuthority()
 
         public void DeparentAllChildren(bool worldPositionStays = true)
         {
-            if (IsRootParent && CheckForAuthority())
+            if (IsRootParent && HasAuthority)
             {
                 var lastChild = GetLastChild(transform);
                 if (lastChild != null)
@@ -163,15 +163,15 @@ private void ParentChild(InSceneParentChildHandler child, bool worldPositionStay
 
         public void ReParentAllChildren(bool worldPositionStays = true)
         {
-            if (IsRootParent && CheckForAuthority())
+            if (IsRootParent && HasAuthority)
             {
                 ParentChild(m_Child, worldPositionStays);
             }
         }
 
         public override void OnNetworkSpawn()
         {
-            if (CheckForAuthority())
+            if (HasAuthority)
             {
                 LogMessage($"[{NetworkObjectId}] Pos = ({m_TargetLocalPosition}) | Rotation ({m_TargetLocalRotation}) | Scale ({m_TargetLocalScale})");
                 if (AddNetworkTransform)
@@ -206,7 +206,7 @@ public override void OnNetworkSpawn()
 
         public void DeparentSetValuesAndReparent()
         {
-            if (IsRootParent && CheckForAuthority())
+            if (IsRootParent && HasAuthority)
             {
                 // Back to back de-parenting and re-parenting
                 s_GenerateRandomValues = true;
@@ -222,7 +222,7 @@ public void DeparentSetValuesAndReparent()
         /// </summary>
         public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
         {
-            if (!CheckForAuthority() || !IsSpawned || parentNetworkObject != null || !s_GenerateRandomValues)
+            if (!HasAuthority || !IsSpawned || parentNetworkObject != null || !s_GenerateRandomValues)
             {
                 return;
             }
@@ -242,7 +242,7 @@ public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObj
 
         private void LateUpdate()
         {
-            if (!IsSpawned || !CheckForAuthority() || NetworkManagerTestDisabler.IsIntegrationTest)
+            if (!IsSpawned || !HasAuthority || NetworkManagerTestDisabler.IsIntegrationTest)
             {
                 return;
             }

testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObjectTests.cs

@@ -578,4 +578,51 @@ protected bool ScaleValuesMatch(Transform transformA, Transform transformB)
         }
 
     }
+
+    internal class InScenePlacedNetworkObjectClientTests : NetcodeIntegrationTest
+    {
+        private const string k_SceneToLoad = "InSceneNetworkObject";
+
+        protected override int NumberOfClients => 0;
+
+        private Scene m_Scene;
+
+        protected override IEnumerator OnSetup()
+        {
+            SceneManager.sceneLoaded += SceneManager_sceneLoaded;
+            SceneManager.LoadScene(k_SceneToLoad, LoadSceneMode.Additive);
+            return base.OnSetup();
+        }
+
+        private void SceneManager_sceneLoaded(Scene scene, LoadSceneMode loadSceneMode)
+        {
+            if (scene.name == k_SceneToLoad && loadSceneMode == LoadSceneMode.Additive)
+            {
+                m_Scene = scene;
+                SceneManager.sceneLoaded -= SceneManager_sceneLoaded;
+            }
+        }
+
+        protected override IEnumerator OnTearDown()
+        {
+            if (m_Scene.isLoaded)
+            {
+                SceneManager.UnloadSceneAsync(m_Scene);
+            }
+            return base.OnTearDown();
+        }
+
+        [UnityTest]
+        public IEnumerator DespawnAndDestroyNetworkObjects()
+        {
+            // Simulate a client disconnecting early by just invoking DespawnAndDestroyNetworkObjects to assure
+            // this method does not destroy in-scene placed NetworkObjects.
+            m_ServerNetworkManager.SpawnManager.DespawnAndDestroyNetworkObjects();
+
+            yield return s_DefaultWaitForTick;
+
+            var insceneObject = GameObject.Find("InSceneObject");
+            Assert.IsNotNull(insceneObject, $"Could not find the in-scene placed {nameof(NetworkObject)}: InSceneObject!");
+        }
+    }
 }