Fix wording

noellie-velez · noellie-velez · commit 7d9ffd5c786d · 2025-12-29T19:27:22.000+01:00
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
@@ -2157,7 +2157,7 @@ internal void SetNetworkParenting(ulong? latestParent, bool worldPositionStays)
         /// </summary>
         /// <param name="parent">The new parent for this NetworkObject transform will be the child of.</param>
         /// <param name="worldPositionStays">If true, the parent-relative position, scale and rotation are modified such that the object keeps the same world space position, rotation and scale as before.</param>
-        /// <returns>Whether or not reparenting was successful.</returns>
+        /// <returns>Whether or not re-parenting was successful.</returns>
         public bool TrySetParent(Transform parent, bool worldPositionStays = true)
         {
             // If we are removing ourself from a parent
@@ -2177,7 +2177,7 @@ public bool TrySetParent(Transform parent, bool worldPositionStays = true)
         /// </summary>
         /// <param name="parent">The new parent for this NetworkObject transform will be the child of.</param>
         /// <param name="worldPositionStays">If true, the parent-relative position, scale and rotation are modified such that the object keeps the same world space position, rotation and scale as before.</param>
-        /// <returns>Whether or not reparenting was successful.</returns>
+        /// <returns>Whether or not re-parenting was successful.</returns>
         public bool TrySetParent(GameObject parent, bool worldPositionStays = true)
         {
             // If we are removing ourself from a parent
@@ -2218,7 +2218,7 @@ public bool TryRemoveParent(bool worldPositionStays = true)
         /// </summary>
         /// <param name="parent">The new parent for this NetworkObject transform will be the child of.</param>
         /// <param name="worldPositionStays">If true, the parent-relative position, scale and rotation are modified such that the object keeps the same world space position, rotation and scale as before.</param>
-        /// <returns>Whether or not reparenting was successful.</returns>
+        /// <returns>Whether or not re-parenting was successful.</returns>
         public bool TrySetParent(NetworkObject parent, bool worldPositionStays = true)
         {
             if (!AutoObjectParentSync)
@@ -2235,7 +2235,7 @@ public bool TrySetParent(NetworkObject parent, bool worldPositionStays = true)
             // It wouldn't make sense to not allow parenting, but keeping this note here as a reminder.
             var isAuthority = HasAuthority || (AllowOwnerToParent && IsOwner);
 
-            // If we don't have authority and we are not shutting down, then don't allow any parenting.
+            // If we don't have authority, and we are not shutting down, then don't allow any parenting.
             // If we are shutting down and don't have authority then allow it.
             if (!isAuthority && !NetworkManager.ShutdownInProgress)
             {
@@ -2295,7 +2295,7 @@ private void OnTransformParentChanged()
                     return;
                 }
                 transform.parent = m_CachedParent;
-                Debug.LogException(new NotListeningException($"{nameof(NetworkManager)} is not listening, start a server or host before reparenting"));
+                Debug.LogException(new NotListeningException($"{nameof(NetworkManager)} is not listening, start a server or host before re-parenting"));
                 return;
             }
             var isAuthority = false;
@@ -2307,18 +2307,17 @@ private void OnTransformParentChanged()
             // If we do not have authority and we are spawned
             if (!isAuthority && IsSpawned)
             {
-
-                // If the cached parent has not already been set and we are in distributed authority mode, then log an exception and exit early as a non-authority instance
+                // If the cached parent has not already been set, and we are in distributed authority mode, then log an exception and exit early as a non-authority instance
                 // is trying to set the parent.
                 if (distributedAuthority)
                 {
                     transform.parent = m_CachedParent;
-                    NetworkLog.LogError($"[Not Owner] Only the owner-authority of child {gameObject.name}'s {nameof(NetworkObject)} component can reparent it!");
+                    NetworkLog.LogError($"[Not Owner] Only the owner-authority of child {gameObject.name}'s {nameof(NetworkObject)} component can re-parent it!");
                 }
                 else
                 {
                     transform.parent = m_CachedParent;
-                    Debug.LogException(new NotServerException($"Only the server can reparent {nameof(NetworkObject)}s"));
+                    Debug.LogException(new NotServerException($"Only the server can re-parent {nameof(NetworkObject)}s"));
                 }
                 return;
             }
@@ -2336,7 +2335,7 @@ private void OnTransformParentChanged()
                 else
                 {
                     transform.parent = m_CachedParent;
-                    Debug.LogException(new SpawnStateException($"{nameof(NetworkObject)} can only be reparented after being spawned"));
+                    Debug.LogException(new SpawnStateException($"{nameof(NetworkObject)} can only be re-parented after being spawned"));
                 }
                 return;
             }
@@ -2356,7 +2355,7 @@ private void OnTransformParentChanged()
                 {
                     transform.parent = m_CachedParent;
                     AuthorityAppliedParenting = false;
-                    Debug.LogException(new SpawnStateException($"{nameof(NetworkObject)} can only be reparented under another spawned {nameof(NetworkObject)}"));
+                    Debug.LogException(new SpawnStateException($"{nameof(NetworkObject)} can only be re-parented under another spawned {nameof(NetworkObject)}"));
                     return;
                 }
 
@@ -2457,7 +2456,7 @@ internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpa
                 var parentNetworkObject = transform.parent.GetComponent<NetworkObject>();
 
                 // If parentNetworkObject is null then the parent is a GameObject without a NetworkObject component
-                // attached. Under this case, we preserve the hierarchy but we don't keep track of the parenting.
+                // attached. Under this case, we preserve the hierarchy, but we don't keep track of the parenting.
                 // Note: We only start tracking parenting if the user removes the child from the standard GameObject
                 // parent and then re-parents the child under a GameObject with a NetworkObject component attached.
                 if (!parentNetworkObject)
@@ -2476,7 +2475,7 @@ internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpa
                 else
                 {
                     // If we made it this far, go ahead and set the network parenting values
-                    // with the WorldPoisitonSays value set to false
+                    // with the WorldPositionSays value set to false.
                     // Note: Since in-scene placed NetworkObjects are parented in the scene
                     // the default "assumption" is that children are parenting local space
                     // relative.
@@ -2489,7 +2488,7 @@ internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpa
                 }
             }
 
-            // If we are removing the parent or our latest parent is not set, then remove the parent
+            // If we are removing the parent or our latest parent is not set, then remove the parent.
             // removeParent is only set when:
             //  - The server-side NetworkObject.OnTransformParentChanged is invoked and the parent is being removed
             //  - The client-side when handling a ParentSyncMessage
@@ -3192,7 +3191,7 @@ internal SceneObject GetMessageSceneObject(ulong targetClientId = NetworkManager
             // Handle Parenting
             if (!AlwaysReplicateAsRoot && obj.HasParent)
             {
-                var parentNetworkObject = transform.parent.GetComponent<NetworkObject>();
+                var parentNetworkObject = m_CachedParent.GetComponent<NetworkObject>();
 
                 if (parentNetworkObject)
                 {

Original file line number	Diff line number	Diff line change
`@@ -2157,7 +2157,7 @@ internal void SetNetworkParenting(ulong? latestParent, bool worldPositionStays)`
`2157`	`2157`	`/// </summary>`
`2158`	`2158`	`/// <param name="parent">The new parent for this NetworkObject transform will be the child of.</param>`
`2159`	`2159`	`/// <param name="worldPositionStays">If true, the parent-relative position, scale and rotation are modified such that the object keeps the same world space position, rotation and scale as before.</param>`
`2160`		`- /// <returns>Whether or not reparenting was successful.</returns>`
	`2160`	`+ /// <returns>Whether or not re-parenting was successful.</returns>`
`2161`	`2161`	`public bool TrySetParent(Transform parent, bool worldPositionStays = true)`
`2162`	`2162`	`{`
`2163`	`2163`	`// If we are removing ourself from a parent`
`@@ -2177,7 +2177,7 @@ public bool TrySetParent(Transform parent, bool worldPositionStays = true)`
`2177`	`2177`	`/// </summary>`
`2178`	`2178`	`/// <param name="parent">The new parent for this NetworkObject transform will be the child of.</param>`
`2179`	`2179`	`/// <param name="worldPositionStays">If true, the parent-relative position, scale and rotation are modified such that the object keeps the same world space position, rotation and scale as before.</param>`
`2180`		`- /// <returns>Whether or not reparenting was successful.</returns>`
	`2180`	`+ /// <returns>Whether or not re-parenting was successful.</returns>`
`2181`	`2181`	`public bool TrySetParent(GameObject parent, bool worldPositionStays = true)`
`2182`	`2182`	`{`
`2183`	`2183`	`// If we are removing ourself from a parent`
`@@ -2218,7 +2218,7 @@ public bool TryRemoveParent(bool worldPositionStays = true)`
`2218`	`2218`	`/// </summary>`
`2219`	`2219`	`/// <param name="parent">The new parent for this NetworkObject transform will be the child of.</param>`
`2220`	`2220`	`/// <param name="worldPositionStays">If true, the parent-relative position, scale and rotation are modified such that the object keeps the same world space position, rotation and scale as before.</param>`
`2221`		`- /// <returns>Whether or not reparenting was successful.</returns>`
	`2221`	`+ /// <returns>Whether or not re-parenting was successful.</returns>`
`2222`	`2222`	`public bool TrySetParent(NetworkObject parent, bool worldPositionStays = true)`
`2223`	`2223`	`{`
`2224`	`2224`	`if (!AutoObjectParentSync)`
`@@ -2235,7 +2235,7 @@ public bool TrySetParent(NetworkObject parent, bool worldPositionStays = true)`
`2235`	`2235`	`// It wouldn't make sense to not allow parenting, but keeping this note here as a reminder.`
`2236`	`2236`	`var isAuthority = HasAuthority \|\| (AllowOwnerToParent && IsOwner);`
`2237`	`2237`
`2238`		`- // If we don't have authority and we are not shutting down, then don't allow any parenting.`
	`2238`	`+ // If we don't have authority, and we are not shutting down, then don't allow any parenting.`
`2239`	`2239`	`// If we are shutting down and don't have authority then allow it.`
`2240`	`2240`	`if (!isAuthority && !NetworkManager.ShutdownInProgress)`
`2241`	`2241`	`{`
`@@ -2295,7 +2295,7 @@ private void OnTransformParentChanged()`
`2295`	`2295`	`return;`
`2296`	`2296`	`}`
`2297`	`2297`	`transform.parent = m_CachedParent;`
`2298`		`- Debug.LogException(new NotListeningException($"{nameof(NetworkManager)} is not listening, start a server or host before reparenting"));`
	`2298`	`+ Debug.LogException(new NotListeningException($"{nameof(NetworkManager)} is not listening, start a server or host before re-parenting"));`
`2299`	`2299`	`return;`
`2300`	`2300`	`}`
`2301`	`2301`	`var isAuthority = false;`
`@@ -2307,18 +2307,17 @@ private void OnTransformParentChanged()`
`2307`	`2307`	`// If we do not have authority and we are spawned`
`2308`	`2308`	`if (!isAuthority && IsSpawned)`
`2309`	`2309`	`{`
`2310`		`-`
`2311`		`- // If the cached parent has not already been set and we are in distributed authority mode, then log an exception and exit early as a non-authority instance`
	`2310`	`+ // If the cached parent has not already been set, and we are in distributed authority mode, then log an exception and exit early as a non-authority instance`
`2312`	`2311`	`// is trying to set the parent.`
`2313`	`2312`	`if (distributedAuthority)`
`2314`	`2313`	`{`
`2315`	`2314`	`transform.parent = m_CachedParent;`
`2316`		`- NetworkLog.LogError($"[Not Owner] Only the owner-authority of child {gameObject.name}'s {nameof(NetworkObject)} component can reparent it!");`
	`2315`	`+ NetworkLog.LogError($"[Not Owner] Only the owner-authority of child {gameObject.name}'s {nameof(NetworkObject)} component can re-parent it!");`
`2317`	`2316`	`}`
`2318`	`2317`	`else`
`2319`	`2318`	`{`
`2320`	`2319`	`transform.parent = m_CachedParent;`
`2321`		`- Debug.LogException(new NotServerException($"Only the server can reparent {nameof(NetworkObject)}s"));`
	`2320`	`+ Debug.LogException(new NotServerException($"Only the server can re-parent {nameof(NetworkObject)}s"));`
`2322`	`2321`	`}`
`2323`	`2322`	`return;`
`2324`	`2323`	`}`
`@@ -2336,7 +2335,7 @@ private void OnTransformParentChanged()`
`2336`	`2335`	`else`
`2337`	`2336`	`{`
`2338`	`2337`	`transform.parent = m_CachedParent;`
`2339`		`- Debug.LogException(new SpawnStateException($"{nameof(NetworkObject)} can only be reparented after being spawned"));`
	`2338`	`+ Debug.LogException(new SpawnStateException($"{nameof(NetworkObject)} can only be re-parented after being spawned"));`
`2340`	`2339`	`}`
`2341`	`2340`	`return;`
`2342`	`2341`	`}`
`@@ -2356,7 +2355,7 @@ private void OnTransformParentChanged()`
`2356`	`2355`	`{`
`2357`	`2356`	`transform.parent = m_CachedParent;`
`2358`	`2357`	`AuthorityAppliedParenting = false;`
`2359`		`- Debug.LogException(new SpawnStateException($"{nameof(NetworkObject)} can only be reparented under another spawned {nameof(NetworkObject)}"));`
	`2358`	`+ Debug.LogException(new SpawnStateException($"{nameof(NetworkObject)} can only be re-parented under another spawned {nameof(NetworkObject)}"));`
`2360`	`2359`	`return;`
`2361`	`2360`	`}`
`2362`	`2361`
`@@ -2457,7 +2456,7 @@ internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpa`
`2457`	`2456`	`var parentNetworkObject = transform.parent.GetComponent<NetworkObject>();`
`2458`	`2457`
`2459`	`2458`	`// If parentNetworkObject is null then the parent is a GameObject without a NetworkObject component`
`2460`		`- // attached. Under this case, we preserve the hierarchy but we don't keep track of the parenting.`
	`2459`	`+ // attached. Under this case, we preserve the hierarchy, but we don't keep track of the parenting.`
`2461`	`2460`	`// Note: We only start tracking parenting if the user removes the child from the standard GameObject`
`2462`	`2461`	`// parent and then re-parents the child under a GameObject with a NetworkObject component attached.`
`2463`	`2462`	`if (!parentNetworkObject)`
`@@ -2476,7 +2475,7 @@ internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpa`
`2476`	`2475`	`else`
`2477`	`2476`	`{`
`2478`	`2477`	`// If we made it this far, go ahead and set the network parenting values`
`2479`		`- // with the WorldPoisitonSays value set to false`
	`2478`	`+ // with the WorldPositionSays value set to false.`
`2480`	`2479`	`// Note: Since in-scene placed NetworkObjects are parented in the scene`
`2481`	`2480`	`// the default "assumption" is that children are parenting local space`
`2482`	`2481`	`// relative.`
`@@ -2489,7 +2488,7 @@ internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpa`
`2489`	`2488`	`}`
`2490`	`2489`	`}`
`2491`	`2490`
`2492`		`- // If we are removing the parent or our latest parent is not set, then remove the parent`
	`2491`	`+ // If we are removing the parent or our latest parent is not set, then remove the parent.`
`2493`	`2492`	`// removeParent is only set when:`
`2494`	`2493`	`// - The server-side NetworkObject.OnTransformParentChanged is invoked and the parent is being removed`
`2495`	`2494`	`// - The client-side when handling a ParentSyncMessage`
`@@ -3192,7 +3191,7 @@ internal SceneObject GetMessageSceneObject(ulong targetClientId = NetworkManager`
`3192`	`3191`	`// Handle Parenting`
`3193`	`3192`	`if (!AlwaysReplicateAsRoot && obj.HasParent)`
`3194`	`3193`	`{`
`3195`		`- var parentNetworkObject = transform.parent.GetComponent<NetworkObject>();`
	`3194`	`+ var parentNetworkObject = m_CachedParent.GetComponent<NetworkObject>();`
`3196`	`3195`
`3197`	`3196`	`if (parentNetworkObject)`
`3198`	`3197`	`{`