Ensure DeferDespawn tick is always reset

Author: EmandM

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

@@ -1582,19 +1582,16 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
                     }
                 }
 
-                if (networkObject.IsSceneObject == false && destroyGameObject == false)
-                {
-                    // DANGO-TODO: Check that this is still a valid restriction
-                    Debug.LogWarning("Only Scene Objects are valid to not be destroyed when despawned");
-                }
-
                 if (m_TargetClientIds.Count > 0 && !NetworkManager.ShutdownInProgress)
                 {
+                    // DANGO-TODO: Reconfigure Client-side object destruction on despawn
+                    bool destroyOnClient = !(networkObject.IsSceneObject == false && destroyGameObject == false);
+
                     var message = new DestroyObjectMessage
                     {
                         NetworkObjectId = networkObject.NetworkObjectId,
                         DeferredDespawnTick = networkObject.DeferredDespawnTick,
-                        DestroyGameObject = networkObject.IsSceneObject != false ? destroyGameObject : true,
+                        DestroyGameObject = destroyOnClient,
                         IsTargetedDestroy = false,
                         IsDistributedAuthority = distributedAuthority,
                     };
@@ -1607,6 +1604,7 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
             }
 
             networkObject.IsSpawned = false;
+            networkObject.DeferredDespawnTick = 0;
 
             if (SpawnedObjects.Remove(networkObject.NetworkObjectId))
             {

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

@@ -56,7 +56,7 @@ protected override bool CanStartServerAndClients()
         public enum DespawnMode
         {
             Despawn,
-            DeferredDespawn,
+            DeferDespawn,
         }
 
         /// <summary>
@@ -69,9 +69,9 @@ public enum DespawnMode
         [UnityTest]
         public IEnumerator InSceneNetworkObjectSynchAndSpawn([Values] DespawnMode despawnMode)
         {
-            if (!m_DistributedAuthority && despawnMode == DespawnMode.DeferredDespawn)
+            if (!m_DistributedAuthority && despawnMode == DespawnMode.DeferDespawn)
             {
-                Assert.Ignore("Deferred Despawn is only valid with Distributed Authority mode.");
+                Assert.Ignore($"Test ignored as DeferDespawn is only valid with Distributed Authority mode.");
             }
 
             NetworkObjectTestComponent.VerboseDebug = true;
@@ -150,12 +150,6 @@ public IEnumerator InSceneNetworkObjectSynchAndSpawn([Values] DespawnMode despaw
             yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == clientCount);
             AssertOnTimeout($"Timed out waiting for all in-scene instances to be spawned!  Current spawned count: {NetworkObjectTestComponent.SpawnedInstances.Count()} | Expected spawn count: {clientCount}");
 
-            if (despawnMode == DespawnMode.DeferredDespawn)
-            {
-                // TODO: Check if this is the expected behavior
-                serverObject.DeferredDespawnTick = 0;
-            }
-
             // Test NetworkHide on the first client
             var firstClientId = m_ClientNetworkManagers[0].LocalClientId;