Merge remote-tracking branch 'smitdylan/Fix/Performance-Optimization' into fix/performance-optimizations

EmandM · EmandM · commit ae12e5d118ac · 2025-09-17T10:30:59.000-04:00
diff --git a/com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs
@@ -1432,10 +1432,7 @@ private void ProcessNetworkBehaviour(TypeDefinition typeDefinition, string[] ass
                     if (typeDefinition.HasGenericParameters)
                     {
                         var genericTypes = new List<TypeReference>();
-                        foreach (var parameter in typeDefinition.GenericParameters)
-                        {
-                            genericTypes.Add(parameter);
-                        }
+                        genericTypes.AddRange(typeDefinition.GenericParameters);
                         callMethod = callMethod.MakeGeneric(genericTypes.ToArray());
                     }
 
@@ -3102,10 +3099,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
             if (castType.HasGenericParameters)
             {
                 var genericTypes = new List<TypeReference>();
-                foreach (var parameter in castType.GenericParameters)
-                {
-                    genericTypes.Add(parameter);
-                }
+                genericTypes.AddRange(castType.GenericParameters);
                 castType = castType.MakeGenericInstanceType(genericTypes.ToArray());
                 callMethod = callMethod.MakeGeneric(genericTypes.ToArray());
             }
diff --git a/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsProjectSettings.cs b/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsProjectSettings.cs
@@ -22,7 +22,7 @@ public class NetcodeForGameObjectsProjectSettings : ScriptableSingleton<NetcodeF
 
         private void OnEnable()
         {
-            if (NetworkPrefabsPath == "")
+            if (NetworkPrefabsPath?.Length == 0)
             {
                 NetworkPrefabsPath = DefaultNetworkPrefabsPath;
             }
diff --git a/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeSettingsProvider.cs b/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeSettingsProvider.cs
@@ -36,7 +36,7 @@ private static void OnDeactivate()
             if (settings.TempNetworkPrefabsPath != settings.NetworkPrefabsPath)
             {
                 var newPath = settings.TempNetworkPrefabsPath;
-                if (newPath == "")
+                if (newPath?.Length == 0)
                 {
                     newPath = NetcodeForGameObjectsProjectSettings.DefaultNetworkPrefabsPath;
                     settings.TempNetworkPrefabsPath = newPath;
diff --git a/com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs b/com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs
@@ -129,7 +129,7 @@ public override void OnInspectorGUI()
                 overrideIp = EditorGUILayout.TextField("Override Bind IP (optional)", overrideIp);
                 if (allowRemoteConnections)
                 {
-                    if (overrideIp == "")
+                    if (overrideIp?.Length == 0)
                     {
                         if (isIpV6)
                         {
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs
@@ -251,7 +251,7 @@ private void DisplayNetworkManagerProperties()
                         // Default directory
                         var directory = "Assets/";
                         var assetPath = AssetDatabase.GetAssetPath(m_NetworkManager);
-                        if (assetPath == "")
+                        if (assetPath?.Length == 0)
                         {
                             assetPath = PrefabUtility.GetPrefabAssetPathOfNearestInstanceRoot(m_NetworkManager);
                         }
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/AnticipatedNetworkTransform.cs b/com.unity.netcode.gameobjects/Runtime/Components/AnticipatedNetworkTransform.cs
@@ -240,8 +240,7 @@ public void AnticipateState(TransformState newState)
                 return;
             }
             var transform_ = transform;
-            transform_.position = newState.Position;
-            transform_.rotation = newState.Rotation;
+            transform_.SetPositionAndRotation(newState.Position, newState.Rotation);
             transform_.localScale = newState.Scale;
             m_AnticipatedTransform = newState;
             if (CanCommitToTransform)
@@ -336,8 +335,7 @@ public void SetupForRender()
                         Transform.m_AnticipatedTransform = Transform.m_AuthoritativeTransform;
                     }
 
-                    transform_.position = Transform.m_AnticipatedTransform.Position;
-                    transform_.rotation = Transform.m_AnticipatedTransform.Rotation;
+                    transform_.SetPositionAndRotation(Transform.m_AnticipatedTransform.Position, Transform.m_AnticipatedTransform.Rotation);
                     transform_.localScale = Transform.m_AnticipatedTransform.Scale;
                 }
             }
@@ -347,8 +345,7 @@ public void SetupForUpdate()
                 if (Transform.CanCommitToTransform)
                 {
                     var transform_ = Transform.transform;
-                    transform_.position = Transform.m_AuthoritativeTransform.Position;
-                    transform_.rotation = Transform.m_AuthoritativeTransform.Rotation;
+                    transform_.SetPositionAndRotation(Transform.m_AuthoritativeTransform.Position, Transform.m_AuthoritativeTransform.Rotation);
                     transform_.localScale = Transform.m_AuthoritativeTransform.Scale;
                 }
             }
@@ -493,8 +490,7 @@ public void Smooth(TransformState from, TransformState to, float durationSeconds
             {
                 m_AnticipatedTransform = to;
                 m_PreviousAnticipatedTransform = m_AnticipatedTransform;
-                transform_.position = to.Position;
-                transform_.rotation = to.Rotation;
+                transform_.SetPositionAndRotation(to.Position, to.Rotation);
                 transform_.localScale = to.Scale;
                 m_SmoothDuration = 0;
                 m_CurrentSmoothTime = 0;
@@ -505,8 +501,7 @@ public void Smooth(TransformState from, TransformState to, float durationSeconds
 
             if (!CanCommitToTransform)
             {
-                transform_.position = from.Position;
-                transform_.rotation = from.Rotation;
+                transform_.SetPositionAndRotation(from.Position, from.Rotation);
                 transform_.localScale = from.Scale;
             }
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs b/com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs
@@ -181,7 +181,7 @@ public bool HasPositionChange
             {
                 get
                 {
-                    return HasPositionX | HasPositionY | HasPositionZ;
+                    return HasPositionX || HasPositionY || HasPositionZ;
                 }
             }
 
@@ -241,7 +241,7 @@ public bool HasRotAngleChange
             {
                 get
                 {
-                    return HasRotAngleX | HasRotAngleY | HasRotAngleZ;
+                    return HasRotAngleX || HasRotAngleY || HasRotAngleZ;
                 }
             }
 
@@ -301,7 +301,7 @@ public bool HasScaleChange
             {
                 get
                 {
-                    return HasScaleX | HasScaleY | HasScaleZ;
+                    return HasScaleX || HasScaleY || HasScaleZ;
                 }
             }
 
@@ -3950,8 +3950,7 @@ private void SetStateInternal(Vector3 pos, Quaternion rot, Vector3 scale, bool s
             {
                 if (InLocalSpace)
                 {
-                    transform.localPosition = pos;
-                    transform.localRotation = rot;
+                    transform.SetLocalPositionAndRotation(pos, rot);
                 }
                 else
                 {
@@ -4539,8 +4538,8 @@ private void UpdateTransformState()
             // - If UsUnrealiable is not enabled
             // - If teleporting or synchronizing
             // - If sending an UnrealiableFrameSync or synchronizing the base position of the NetworkDeltaPosition
-            var networkDelivery = !UseUnreliableDeltas | m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame | m_LocalAuthoritativeNetworkState.IsSynchronizing
-                | m_LocalAuthoritativeNetworkState.UnreliableFrameSync | m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat
+            var networkDelivery = !UseUnreliableDeltas || m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame || m_LocalAuthoritativeNetworkState.IsSynchronizing
+                || m_LocalAuthoritativeNetworkState.UnreliableFrameSync || m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat
                 ? NetworkDelivery.ReliableSequenced : NetworkDelivery.UnreliableSequenced;
 
             // Server-host-dahost always sends updates to all clients (but itself)
diff --git a/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs
@@ -109,10 +109,7 @@ public void Initialize(bool warnInvalid = true)
             {
                 foreach (var list in NetworkPrefabsLists)
                 {
-                    foreach (var networkPrefab in list.PrefabList)
-                    {
-                        prefabs.Add(networkPrefab);
-                    }
+                    prefabs.AddRange(list.PrefabList);
                 }
             }
 
@@ -154,7 +151,7 @@ public void Initialize(bool warnInvalid = true)
                 if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
                 {
                     var sb = new StringBuilder("Removing invalid prefabs from Network Prefab registration: ");
-                    sb.Append(string.Join(", ", removeList));
+                    sb.AppendJoin(", ", removeList);
                     NetworkLog.LogWarning(sb.ToString());
                 }
             }
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
@@ -364,7 +364,7 @@ internal bool HasParentNetworkObject(Transform transform)
         /// <summary>
         /// Useful to know if we should or should not send a message
         /// </summary>
-        internal bool HasRemoteObservers => !(Observers.Count() == 0 || (Observers.Contains(NetworkManager.LocalClientId) && Observers.Count() == 1));
+        internal bool HasRemoteObservers => !(Observers.Count == 0 || (Observers.Contains(NetworkManager.LocalClientId) && Observers.Count == 1));
 
         /// <summary>
         /// Distributed Authority Mode Only
@@ -1085,7 +1085,7 @@ internal void SendOwnershipStatusUpdate()
             }
             else
             {
-                changeOwnership.ClientIdCount = Observers.Count();
+                changeOwnership.ClientIdCount = Observers.Count;
                 changeOwnership.ClientIds = Observers.ToArray();
                 NetworkManager.ConnectionManager.SendMessage(ref changeOwnership, NetworkDelivery.Reliable, NetworkManager.ServerClientId);
             }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ParentSyncMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ParentSyncMessage.cs
@@ -130,13 +130,11 @@ public void Handle(ref NetworkContext context)
                 // the values of the server-side post-parenting transform values
                 if (!WorldPositionStays)
                 {
-                    networkObject.transform.localPosition = Position;
-                    networkObject.transform.localRotation = Rotation;
+                    networkObject.transform.SetLocalPositionAndRotation(Position, Rotation);
                 }
                 else
                 {
-                    networkObject.transform.position = Position;
-                    networkObject.transform.rotation = Rotation;
+                    networkObject.transform.SetPositionAndRotation(Position, Rotation);
                 }
                 networkObject.transform.localScale = Scale;
             }
diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
@@ -801,8 +801,7 @@ internal NetworkObject InstantiateAndSpawnNoParameterChecks(NetworkObject networ
                 return null;
             }
             networkObject.IsPlayerObject = isPlayerObject;
-            networkObject.transform.position = position;
-            networkObject.transform.rotation = rotation;
+            networkObject.transform.SetPositionAndRotation(position, rotation);
             // If spawning as a player, then invoke SpawnAsPlayerObject
             if (isPlayerObject)
             {
@@ -901,8 +900,7 @@ internal NetworkObject GetNetworkObjectToSpawn(uint globalObjectIdHash, ulong ow
         internal NetworkObject InstantiateNetworkPrefab(GameObject networkPrefab, uint prefabGlobalObjectIdHash, Vector3? position, Quaternion? rotation)
         {
             var networkObject = UnityEngine.Object.Instantiate(networkPrefab).GetComponent<NetworkObject>();
-            networkObject.transform.position = position ?? networkObject.transform.position;
-            networkObject.transform.rotation = rotation ?? networkObject.transform.rotation;
+            networkObject.transform.SetPositionAndRotation(position ?? networkObject.transform.position, rotation ?? networkObject.transform.rotation);
             networkObject.NetworkManagerOwner = NetworkManager;
             networkObject.PrefabGlobalObjectIdHash = prefabGlobalObjectIdHash;
             return networkObject;
@@ -996,13 +994,11 @@ internal NetworkObject CreateLocalNetworkObject(NetworkObject.SceneObject sceneO
                     // then we want to apply the position and rotation values world space relative
                     if ((worldPositionStays && !nonNetworkObjectParent) || !networkObject.AutoObjectParentSync)
                     {
-                        networkObject.transform.position = position;
-                        networkObject.transform.rotation = rotation;
+                        networkObject.transform.SetPositionAndRotation(position, rotation);
                     }
                     else
                     {
-                        networkObject.transform.localPosition = position;
-                        networkObject.transform.localRotation = rotation;
+                        networkObject.transform.SetLocalPositionAndRotation(position, rotation);
                     }
 
                     // SPECIAL CASE:
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformOwnershipTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformOwnershipTests.cs
@@ -53,8 +53,7 @@ protected override void OnServerAndClientsCreated()
             rigidBody.detectCollisions = false;
             rigidBody.position = Vector3.zero;
             rigidBody.rotation = Quaternion.identity;
-            rigidBody.transform.position = Vector3.zero;
-            rigidBody.transform.rotation = Quaternion.identity;
+            rigidBody.transform.SetPositionAndRotation(Vector3.zero, Quaternion.identity);
             // NOTE: We don't use a sphere collider for this integration test because by the time we can
             // assure they don't collide and skew the results the NetworkObjects are already synchronized
             // with skewed results
@@ -77,8 +76,7 @@ protected override void OnServerAndClientsCreated()
             rigidBody.detectCollisions = false;
             rigidBody.position = Vector3.zero;
             rigidBody.rotation = Quaternion.identity;
-            rigidBody.transform.position = Vector3.zero;
-            rigidBody.transform.rotation = Quaternion.identity;
+            rigidBody.transform.SetPositionAndRotation(Vector3.zero, Quaternion.identity);
             // NOTE: We don't use a sphere collider for this integration test because by the time we can
             // assure they don't collide and skew the results the NetworkObjects are already synchronized
             // with skewed results
@@ -302,8 +300,7 @@ void LogOwnerRigidBody(int stage)
             }
             else
             {
-                ownerInstance.transform.position = valueSetByOwner;
-                ownerInstance.transform.rotation = rotation;
+                ownerInstance.transform.SetPositionAndRotation(valueSetByOwner, rotation);
                 ownerInstance.transform.localScale = valueSetByOwner;
             }
 
@@ -392,8 +389,7 @@ void LogOwnerRigidBody(int stage)
             else
             {
                 m_UseAdjustedVariance = false;
-                ownerInstance.transform.position = valueSetByOwner;
-                ownerInstance.transform.rotation = rotation;
+                ownerInstance.transform.SetPositionAndRotation(valueSetByOwner, rotation);
             }
 
             LogOwnerRigidBody(3);
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableCollectionsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableCollectionsTests.cs
@@ -726,7 +726,7 @@ private IEnumerator ValidateClients(NetworkManager clientBeingTested, bool initi
 
                 if (initialize)
                 {
-                    clientsInitialized.Add(client.LocalClientId, ownerInitialized & serverInitialized);
+                    clientsInitialized.Add(client.LocalClientId, ownerInitialized && serverInitialized);
                 }
             }
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/PlayerObjectTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/PlayerObjectTests.cs
@@ -141,8 +141,7 @@ protected override void OnCreatePlayerPrefab()
             var playerNetworkObject = m_PlayerPrefab.GetComponent<NetworkObject>();
             m_PlayerPosition = GetRandomVector3(-10.0f, 10.0f);
             m_PlayerRotation = Quaternion.Euler(GetRandomVector3(-180.0f, 180.0f));
-            playerNetworkObject.transform.position = m_PlayerPosition;
-            playerNetworkObject.transform.rotation = m_PlayerRotation;
+            playerNetworkObject.transform.SetPositionAndRotation(m_PlayerPosition, m_PlayerRotation);
             base.OnCreatePlayerPrefab();
         }
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerTests.cs
@@ -225,8 +225,7 @@ internal class NetworkPrefaInstanceHandler : INetworkPrefabInstanceHandler
         public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation)
         {
             var networkObjectInstance = UnityEngine.Object.Instantiate(m_NetworkObject.gameObject).GetComponent<NetworkObject>();
-            networkObjectInstance.transform.position = position;
-            networkObjectInstance.transform.rotation = rotation;
+            networkObjectInstance.transform.SetPositionAndRotation(position, rotation);
             m_Instances.Add(networkObjectInstance);
             return networkObjectInstance;
         }

Original file line number	Diff line number	Diff line change
`@@ -1432,10 +1432,7 @@ private void ProcessNetworkBehaviour(TypeDefinition typeDefinition, string[] ass`
`1432`	`1432`	`if (typeDefinition.HasGenericParameters)`
`1433`	`1433`	`{`
`1434`	`1434`	`var genericTypes = new List<TypeReference>();`
`1435`		`- foreach (var parameter in typeDefinition.GenericParameters)`
`1436`		`- {`
`1437`		`- genericTypes.Add(parameter);`
`1438`		`- }`
	`1435`	`+ genericTypes.AddRange(typeDefinition.GenericParameters);`
`1439`	`1436`	`callMethod = callMethod.MakeGeneric(genericTypes.ToArray());`
`1440`	`1437`	`}`
`1441`	`1438`
`@@ -3102,10 +3099,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition`
`3102`	`3099`	`if (castType.HasGenericParameters)`
`3103`	`3100`	`{`
`3104`	`3101`	`var genericTypes = new List<TypeReference>();`
`3105`		`- foreach (var parameter in castType.GenericParameters)`
`3106`		`- {`
`3107`		`- genericTypes.Add(parameter);`
`3108`		`- }`
	`3102`	`+ genericTypes.AddRange(castType.GenericParameters);`
`3109`	`3103`	`castType = castType.MakeGenericInstanceType(genericTypes.ToArray());`
`3110`	`3104`	`callMethod = callMethod.MakeGeneric(genericTypes.ToArray());`
`3111`	`3105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class NetcodeForGameObjectsProjectSettings : ScriptableSingleton<NetcodeF`
`22`	`22`
`23`	`23`	`private void OnEnable()`
`24`	`24`	`{`
`25`		`- if (NetworkPrefabsPath == "")`
	`25`	`+ if (NetworkPrefabsPath?.Length == 0)`
`26`	`26`	`{`
`27`	`27`	`NetworkPrefabsPath = DefaultNetworkPrefabsPath;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ private static void OnDeactivate()`
`36`	`36`	`if (settings.TempNetworkPrefabsPath != settings.NetworkPrefabsPath)`
`37`	`37`	`{`
`38`	`38`	`var newPath = settings.TempNetworkPrefabsPath;`
`39`		`- if (newPath == "")`
	`39`	`+ if (newPath?.Length == 0)`
`40`	`40`	`{`
`41`	`41`	`newPath = NetcodeForGameObjectsProjectSettings.DefaultNetworkPrefabsPath;`
`42`	`42`	`settings.TempNetworkPrefabsPath = newPath;`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public override void OnInspectorGUI()`
`129`	`129`	`overrideIp = EditorGUILayout.TextField("Override Bind IP (optional)", overrideIp);`
`130`	`130`	`if (allowRemoteConnections)`
`131`	`131`	`{`
`132`		`- if (overrideIp == "")`
	`132`	`+ if (overrideIp?.Length == 0)`
`133`	`133`	`{`
`134`	`134`	`if (isIpV6)`
`135`	`135`	`{`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ private void DisplayNetworkManagerProperties()`
`251`	`251`	`// Default directory`
`252`	`252`	`var directory = "Assets/";`
`253`	`253`	`var assetPath = AssetDatabase.GetAssetPath(m_NetworkManager);`
`254`		`- if (assetPath == "")`
	`254`	`+ if (assetPath?.Length == 0)`
`255`	`255`	`{`
`256`	`256`	`assetPath = PrefabUtility.GetPrefabAssetPathOfNearestInstanceRoot(m_NetworkManager);`
`257`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,7 @@ public void AnticipateState(TransformState newState)`
`240`	`240`	`return;`
`241`	`241`	`}`
`242`	`242`	`var transform_ = transform;`
`243`		`- transform_.position = newState.Position;`
`244`		`- transform_.rotation = newState.Rotation;`
	`243`	`+ transform_.SetPositionAndRotation(newState.Position, newState.Rotation);`
`245`	`244`	`transform_.localScale = newState.Scale;`
`246`	`245`	`m_AnticipatedTransform = newState;`
`247`	`246`	`if (CanCommitToTransform)`
`@@ -336,8 +335,7 @@ public void SetupForRender()`
`336`	`335`	`Transform.m_AnticipatedTransform = Transform.m_AuthoritativeTransform;`
`337`	`336`	`}`
`338`	`337`
`339`		`- transform_.position = Transform.m_AnticipatedTransform.Position;`
`340`		`- transform_.rotation = Transform.m_AnticipatedTransform.Rotation;`
	`338`	`+ transform_.SetPositionAndRotation(Transform.m_AnticipatedTransform.Position, Transform.m_AnticipatedTransform.Rotation);`
`341`	`339`	`transform_.localScale = Transform.m_AnticipatedTransform.Scale;`
`342`	`340`	`}`
`343`	`341`	`}`
`@@ -347,8 +345,7 @@ public void SetupForUpdate()`
`347`	`345`	`if (Transform.CanCommitToTransform)`
`348`	`346`	`{`
`349`	`347`	`var transform_ = Transform.transform;`
`350`		`- transform_.position = Transform.m_AuthoritativeTransform.Position;`
`351`		`- transform_.rotation = Transform.m_AuthoritativeTransform.Rotation;`
	`348`	`+ transform_.SetPositionAndRotation(Transform.m_AuthoritativeTransform.Position, Transform.m_AuthoritativeTransform.Rotation);`
`352`	`349`	`transform_.localScale = Transform.m_AuthoritativeTransform.Scale;`
`353`	`350`	`}`
`354`	`351`	`}`
`@@ -493,8 +490,7 @@ public void Smooth(TransformState from, TransformState to, float durationSeconds`
`493`	`490`	`{`
`494`	`491`	`m_AnticipatedTransform = to;`
`495`	`492`	`m_PreviousAnticipatedTransform = m_AnticipatedTransform;`
`496`		`- transform_.position = to.Position;`
`497`		`- transform_.rotation = to.Rotation;`
	`493`	`+ transform_.SetPositionAndRotation(to.Position, to.Rotation);`
`498`	`494`	`transform_.localScale = to.Scale;`
`499`	`495`	`m_SmoothDuration = 0;`
`500`	`496`	`m_CurrentSmoothTime = 0;`
`@@ -505,8 +501,7 @@ public void Smooth(TransformState from, TransformState to, float durationSeconds`
`505`	`501`
`506`	`502`	`if (!CanCommitToTransform)`
`507`	`503`	`{`
`508`		`- transform_.position = from.Position;`
`509`		`- transform_.rotation = from.Rotation;`
	`504`	`+ transform_.SetPositionAndRotation(from.Position, from.Rotation);`
`510`	`505`	`transform_.localScale = from.Scale;`
`511`	`506`	`}`
`512`	`507`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ public bool HasPositionChange`
`181`	`181`	`{`
`182`	`182`	`get`
`183`	`183`	`{`
`184`		`- return HasPositionX \| HasPositionY \| HasPositionZ;`
	`184`	`+ return HasPositionX \|\| HasPositionY \|\| HasPositionZ;`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
`@@ -241,7 +241,7 @@ public bool HasRotAngleChange`
`241`	`241`	`{`
`242`	`242`	`get`
`243`	`243`	`{`
`244`		`- return HasRotAngleX \| HasRotAngleY \| HasRotAngleZ;`
	`244`	`+ return HasRotAngleX \|\| HasRotAngleY \|\| HasRotAngleZ;`
`245`	`245`	`}`
`246`	`246`	`}`
`247`	`247`
`@@ -301,7 +301,7 @@ public bool HasScaleChange`
`301`	`301`	`{`
`302`	`302`	`get`
`303`	`303`	`{`
`304`		`- return HasScaleX \| HasScaleY \| HasScaleZ;`
	`304`	`+ return HasScaleX \|\| HasScaleY \|\| HasScaleZ;`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`
`@@ -3950,8 +3950,7 @@ private void SetStateInternal(Vector3 pos, Quaternion rot, Vector3 scale, bool s`
`3950`	`3950`	`{`
`3951`	`3951`	`if (InLocalSpace)`
`3952`	`3952`	`{`
`3953`		`- transform.localPosition = pos;`
`3954`		`- transform.localRotation = rot;`
	`3953`	`+ transform.SetLocalPositionAndRotation(pos, rot);`
`3955`	`3954`	`}`
`3956`	`3955`	`else`
`3957`	`3956`	`{`
`@@ -4539,8 +4538,8 @@ private void UpdateTransformState()`
`4539`	`4538`	`// - If UsUnrealiable is not enabled`
`4540`	`4539`	`// - If teleporting or synchronizing`
`4541`	`4540`	`// - If sending an UnrealiableFrameSync or synchronizing the base position of the NetworkDeltaPosition`
`4542`		`- var networkDelivery = !UseUnreliableDeltas \| m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame \| m_LocalAuthoritativeNetworkState.IsSynchronizing`
`4543`		`- \| m_LocalAuthoritativeNetworkState.UnreliableFrameSync \| m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat`
	`4541`	`+ var networkDelivery = !UseUnreliableDeltas \|\| m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame \|\| m_LocalAuthoritativeNetworkState.IsSynchronizing`
	`4542`	`+ \|\| m_LocalAuthoritativeNetworkState.UnreliableFrameSync \|\| m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat`
`4544`	`4543`	`? NetworkDelivery.ReliableSequenced : NetworkDelivery.UnreliableSequenced;`
`4545`	`4544`
`4546`	`4545`	`// Server-host-dahost always sends updates to all clients (but itself)`
Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,7 @@ public void Initialize(bool warnInvalid = true)`
`109`	`109`	`{`
`110`	`110`	`foreach (var list in NetworkPrefabsLists)`
`111`	`111`	`{`
`112`		`- foreach (var networkPrefab in list.PrefabList)`
`113`		`- {`
`114`		`- prefabs.Add(networkPrefab);`
`115`		`- }`
	`112`	`+ prefabs.AddRange(list.PrefabList);`
`116`	`113`	`}`
`117`	`114`	`}`
`118`	`115`
`@@ -154,7 +151,7 @@ public void Initialize(bool warnInvalid = true)`
`154`	`151`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Error)`
`155`	`152`	`{`
`156`	`153`	`var sb = new StringBuilder("Removing invalid prefabs from Network Prefab registration: ");`
`157`		`- sb.Append(string.Join(", ", removeList));`
	`154`	`+ sb.AppendJoin(", ", removeList);`
`158`	`155`	`NetworkLog.LogWarning(sb.ToString());`
`159`	`156`	`}`
`160`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ internal bool HasParentNetworkObject(Transform transform)`
`364`	`364`	`/// <summary>`
`365`	`365`	`/// Useful to know if we should or should not send a message`
`366`	`366`	`/// </summary>`
`367`		`- internal bool HasRemoteObservers => !(Observers.Count() == 0 \|\| (Observers.Contains(NetworkManager.LocalClientId) && Observers.Count() == 1));`
	`367`	`+ internal bool HasRemoteObservers => !(Observers.Count == 0 \|\| (Observers.Contains(NetworkManager.LocalClientId) && Observers.Count == 1));`
`368`	`368`
`369`	`369`	`/// <summary>`
`370`	`370`	`/// Distributed Authority Mode Only`
`@@ -1085,7 +1085,7 @@ internal void SendOwnershipStatusUpdate()`
`1085`	`1085`	`}`
`1086`	`1086`	`else`
`1087`	`1087`	`{`
`1088`		`- changeOwnership.ClientIdCount = Observers.Count();`
	`1088`	`+ changeOwnership.ClientIdCount = Observers.Count;`
`1089`	`1089`	`changeOwnership.ClientIds = Observers.ToArray();`
`1090`	`1090`	`NetworkManager.ConnectionManager.SendMessage(ref changeOwnership, NetworkDelivery.Reliable, NetworkManager.ServerClientId);`
`1091`	`1091`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,13 +130,11 @@ public void Handle(ref NetworkContext context)`
`130`	`130`	`// the values of the server-side post-parenting transform values`
`131`	`131`	`if (!WorldPositionStays)`
`132`	`132`	`{`
`133`		`- networkObject.transform.localPosition = Position;`
`134`		`- networkObject.transform.localRotation = Rotation;`
	`133`	`+ networkObject.transform.SetLocalPositionAndRotation(Position, Rotation);`
`135`	`134`	`}`
`136`	`135`	`else`
`137`	`136`	`{`
`138`		`- networkObject.transform.position = Position;`
`139`		`- networkObject.transform.rotation = Rotation;`
	`137`	`+ networkObject.transform.SetPositionAndRotation(Position, Rotation);`
`140`	`138`	`}`
`141`	`139`	`networkObject.transform.localScale = Scale;`
`142`	`140`	`}`