Merge branch 'chore/simplify-accessors-misc' of https://github.com/Unity-Technologies/com.unity.netcode.gameobjects into chore/simplify-accessors-misc

# Conflicts:
#	com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

Author: noellie-velez

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

@@ -208,7 +208,7 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
             {
                 foreach (var targetClientId in clientRpcParams.Send.TargetClientIds)
                 {
-                    if (targetClientId == NetworkManager.ServerClientId)
+                    if (targetClientId == networkManager.ServerClientId)
                     {
                         shouldInvokeLocally = true;
                         continue;
@@ -225,7 +225,7 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
             {
                 foreach (var targetClientId in clientRpcParams.Send.TargetClientIdsNativeArray)
                 {
-                    if (targetClientId == NetworkManager.ServerClientId)
+                    if (targetClientId == networkManager.ServerClientId)
                     {
                         shouldInvokeLocally = true;
                         continue;
@@ -353,7 +353,6 @@ internal FastBufferWriter __beginSendRpc(uint rpcMethodId, RpcParams rpcParams,
         internal void __endSendRpc(ref FastBufferWriter bufferWriter, uint rpcMethodId, RpcParams rpcParams, RpcAttribute.RpcAttributeParams attributeParams, SendTo defaultTarget, RpcDelivery rpcDelivery)
 #pragma warning restore IDE1006 // restore naming rule violation check
         {
-            // Sould we create a local networkManager var to improve performance instead of using 2 times m_NetworkManager?
             var rpcMessage = new RpcMessage
             {
                 Metadata = new RpcMetadata
@@ -579,7 +578,7 @@ public NetworkObject NetworkObject
         {
             get
             {
-                if (m_NetworkObject)
+                if (m_NetworkObject != null)
                 {
                     return m_NetworkObject;
                 }
@@ -599,7 +598,7 @@ public NetworkObject NetworkObject
                 // or NetworkBehaviour.IsSpawned (i.e. to early exit if not spawned) which, in turn, could generate several Warning messages
                 // per spawned NetworkObject.  Checking for ShutdownInProgress prevents these unnecessary LogWarning messages.
                 // We must check IsSpawned, otherwise a warning will be logged under certain valid conditions (see OnDestroy)
-                if (IsSpawned && !m_NetworkObject && (!m_NetworkManager || !m_NetworkManager.ShutdownInProgress))
+                if (IsSpawned && !m_NetworkObject && (m_NetworkObject == null || !m_NetworkManager.ShutdownInProgress))
                 {
                     if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                     {

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

@@ -390,7 +390,7 @@ 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)
         {
-            // Ensure we log the DAMode message first as locking ownership is not allowed if not in DAMode.
+            // The DAMode message is logged first, as ownership locking isn’t allowed when not in DAMode, making it the most relevant message.
             if (!NetworkManager.DistributedAuthorityMode)
             {
                 if (NetworkManager.LogLevel <= LogLevel.Error)
@@ -606,7 +606,7 @@ internal void RemoveOwnershipExtended(OwnershipStatusExtended extended)
         /// <returns>true or false depending upon lock operation's success</returns>
         public bool SetOwnershipLock(bool lockOwnership = true)
         {
-            // Ensure we log the DAMode message first as locking ownership is not allowed if not in DAMode.
+            // The DAMode message is logged first, as ownership locking isn’t allowed when not in DAMode, making it the most relevant message.
             if (!NetworkManager.DistributedAuthorityMode)
             {
                 if (NetworkManager.LogLevel <= LogLevel.Error)
@@ -2230,7 +2230,6 @@ internal bool InternalTrySetParent(NetworkObject parent, bool worldPositionStays
             }
 
             m_CachedWorldPositionStays = worldPositionStays;
-            if (parent == null)
             CurrentParent = parent;
             transform.SetParent(CurrentParent?.transform, worldPositionStays);
 

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

@@ -526,7 +526,11 @@ internal void ChangeOwnership(NetworkObject networkObject, ulong clientId, bool
             }
             else if (!isAuthorized)
             {
-                throw new NotServerException("Only the server can change ownership");
+                if (NetworkManager.LogLevel <= LogLevel.Error)
+                {
+                    NetworkLog.LogError($"Only the server can change ownership! (ignoring)");
+                    return;
+                }
             }
 
             //Should this go at the beginning of the function?