Revert cleanup - to move to other branch

Author: noellie-velez

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

@@ -395,13 +395,14 @@ private void CheckForInScenePlaced()
         /// <param name="destroy">Defaults to true, determines whether the <see cref="NetworkObject"/> will be destroyed.</param>
         public void DeferDespawn(int tickOffset, bool destroy = true)
         {
-            // The DAMode message is logged first, as ownership locking isn’t allowed when not in DAMode, making it the most relevant message.
+            // Ensure we log the DAMode message first as locking ownership is not allowed if not DA so the DA message is the most relevant.
             if (!NetworkManager.DistributedAuthorityMode)
             {
                 if (NetworkManager.LogLevel <= LogLevel.Error)
                 {
                     NetworkLog.LogErrorServer($"[{name}] This method is only available in distributed authority mode.");
                 }
+
                 return;
             }
 
@@ -411,6 +412,7 @@ public void DeferDespawn(int tickOffset, bool destroy = true)
                 {
                     NetworkLog.LogErrorServer($"[{name}] Cannot defer despawn while not spawned.");
                 }
+
                 return;
             }
 
@@ -610,7 +612,7 @@ internal void RemoveOwnershipExtended(OwnershipStatusExtended extended)
         /// <returns>true or false depending upon lock operation's success</returns>
         public bool SetOwnershipLock(bool lockOwnership = true)
         {
-            // The DAMode message is logged first, as ownership locking isn’t allowed when not in DAMode, making it the most relevant message.
+            // Ensure we log the DAMode message first as locking ownership is not allowed if not DA so the DA message is the most relevant.
             if (!NetworkManager.DistributedAuthorityMode)
             {
                 if (NetworkManager.LogLevel <= LogLevel.Error)
@@ -626,6 +628,7 @@ public bool SetOwnershipLock(bool lockOwnership = true)
                 {
                     NetworkLog.LogErrorServer($"[{name}][Attempted Lock While not spawned]");
                 }
+
                 return false;
             }
 
@@ -668,6 +671,7 @@ public bool SetOwnershipLock(bool lockOwnership = true)
             {
                 SendOwnershipStatusUpdate();
             }
+
             return true;
         }
 
@@ -793,6 +797,7 @@ public OwnershipRequestStatus RequestOwnership()
                 {
                     NetworkLog.LogErrorServer($"[{name}][Invalid Operation] Cannot request ownership of an NetworkObject before it is spawned.");
                 }
+
                 return OwnershipRequestStatus.InvalidOperation;
             }
             // Exit early the local client is already the owner
@@ -861,7 +866,7 @@ public OwnershipRequestStatus RequestOwnership()
         public OnOwnershipRequestedDelegateHandler OnOwnershipRequested;
 
         /// <summary>
-        /// Invoked by <see cref="ChangeOwnershipMessage"/>
+        /// Invoked by ChangeOwnershipMessage
         /// </summary>
         /// <param name="clientRequestingOwnership">the client requesting ownership</param>
         internal void OwnershipRequest(ulong clientRequestingOwnership)
@@ -3399,6 +3404,7 @@ internal static NetworkObject Deserialize(in SerializedObject serializedObject,
                 {
                     Destroy(networkObject.gameObject);
                 }
+
                 return null;
             }
 
@@ -3555,7 +3561,7 @@ internal void SceneChangedUpdate(Scene scene, bool notify = false)
             OnMigratedToNewScene?.Invoke();
 
             // Only the authority side will notify clients of non-parented NetworkObject scene changes
-            if (isAuthority && notify && transform.parent == null)
+            if (isAuthority && notify && !transform.parent)
             {
                 NetworkManagerOwner.SceneManager.NotifyNetworkObjectSceneChanged(this);
             }