Merge branch 'develop-2.0.0' into fix/v2.x/disconnect-event-notifications-2390

NoelStephensUnity · NoelStephensUnity · commit 983018e3c096 · 2025-08-15T11:27:25.000-05:00
diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md
@@ -17,13 +17,16 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
+- Fixed an issue where `UnityTransport` would not accept single words as valid hostnames (notably "localhost"). (#3591)
 - Fixed issue where viewing a `NetworkBehaviour` with one or more `NetworkVariable` fields could throw an exception if running a distributed authority network topology with a local (DAHost) host and viewed on the host when the host is not the authority of the associated `NetworkObject`. (#3578)
 - Fixed issue when using a distributed authority network topology and  viewing a `NetworkBehaviour` with one or more `NetworkVariable` fields in the inspector view would not show editable fields. (#3578)
 - Fixed issue where the disconnect event and provided message was too generic to know why the disconnect occurred. (#3551)
 - Fixed issue where `SendTo.NotMe` could cause an RPC to be delivered to the sender when connected to a live distributed authority session. (#3551)
+- Fixed issue with unnecessary internal GC Allocations when using the `IReadOnlyList`  `NetworkManager.ConnectedClientsIds` within a `foreach` statement by either replacing with a `for` loop or directly referencing the `NetworkConnectionManager.ConnectedClientIds`. (#3527)
 
 ### Changed
 
+- Marked `UnityTransport.ConnectionAddressData.ServerEndPoint` as obsolete. It can't work when using hostnames as the server address, and its functionality can easily be replicated using `NetworkEndpoint.Parse`. (#3591)
 - Optimized `NetworkList<T>` indexer setter to skip operations when the new value equals the existing value, improving performance by avoiding unnecessary list events and network synchronization. (#3587)
 - Changed `UnityTransport` now handles setting the current disconnect notification type, via internal `UnityTransportNotificationHandler` class, while also providing extended informational messages for each disconnect event type. (#3551)
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs b/com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs
@@ -996,7 +996,7 @@ internal void CheckForAnimatorChanges()
                 {
                     // Just notify all remote clients and not the local server
                     m_ClientSendList.Clear();
-                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                    foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)
                     {
                         if (clientId == NetworkManager.LocalClientId || !NetworkObject.Observers.Contains(clientId))
                         {
@@ -1315,7 +1315,7 @@ private unsafe void SendParametersUpdateServerRpc(ParametersUpdateMessage parame
                 if (NetworkManager.ConnectedClientsIds.Count > (IsHost ? 2 : 1))
                 {
                     m_ClientSendList.Clear();
-                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                    foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)
                     {
                         if (clientId == serverRpcParams.Receive.SenderClientId || clientId == NetworkManager.ServerClientId || !NetworkObject.Observers.Contains(clientId))
                         {
@@ -1378,7 +1378,7 @@ private void SendAnimStateServerRpc(AnimationMessage animationMessage, ServerRpc
                 if (NetworkManager.ConnectedClientsIds.Count > (IsHost ? 2 : 1))
                 {
                     m_ClientSendList.Clear();
-                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                    foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)
                     {
                         if (clientId == serverRpcParams.Receive.SenderClientId || clientId == NetworkManager.ServerClientId || !NetworkObject.Observers.Contains(clientId))
                         {
@@ -1452,7 +1452,7 @@ internal void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerM
             InternalSetTrigger(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
 
             m_ClientSendList.Clear();
-            foreach (var clientId in NetworkManager.ConnectedClientsIds)
+            foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)
             {
                 if (clientId == NetworkManager.ServerClientId || !NetworkObject.Observers.Contains(clientId))
                 {
diff --git a/com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs b/com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs
@@ -149,12 +149,12 @@ internal void InvokeOnClientConnectedCallback(ulong clientId)
             }
 
             // Invoking connection event on non-authority local client. Need to calculate PeerIds.
-            var peerClientIds = new NativeArray<ulong>(Math.Max(NetworkManager.ConnectedClientsIds.Count - 1, 0), Allocator.Temp);
+            var peerClientIds = new NativeArray<ulong>(Math.Max(ConnectedClientIds.Count - 1, 0), Allocator.Temp);
             // `using var peerClientIds` or `using(peerClientIds)` renders it immutable...
             using var sentinel = peerClientIds;
 
             var idx = 0;
-            foreach (var peerId in NetworkManager.ConnectedClientsIds)
+            foreach (var peerId in ConnectedClientIds)
             {
                 if (peerId == NetworkManager.LocalClientId)
                 {
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
@@ -1616,7 +1616,7 @@ public void NetworkHide(ulong clientId)
                         // Send destroy call
                         size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientId);
                         // Broadcast the destroy to all clients so they can update their observers list
-                        foreach (var client in NetworkManager.ConnectedClientsIds)
+                        foreach (var client in NetworkManager.ConnectionManager.ConnectedClientIds)
                         {
                             if (client == clientId || client == NetworkManager.LocalClientId)
                             {
@@ -2363,7 +2363,7 @@ private void OnTransformParentChanged()
                 }
                 else
                 {
-                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                    foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)
                     {
                         if (clientId == NetworkManager.ServerClientId)
                         {
@@ -2382,7 +2382,7 @@ private void OnTransformParentChanged()
                     var maxCount = NetworkManager.ConnectedClientsIds.Count;
                     ulong* clientIds = stackalloc ulong[maxCount];
                     int idx = 0;
-                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                    foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)
                     {
                         if (clientId == NetworkManager.ServerClientId)
                         {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ChangeOwnershipMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ChangeOwnershipMessage.cs
@@ -250,8 +250,9 @@ public void Handle(ref NetworkContext context)
                 }
                 else
                 {
-                    foreach (var clientId in clientList)
+                    for (int i = 0; i < clientList.Count; i++)
                     {
+                        var clientId = clientList[i];
                         if (clientId == networkManager.LocalClientId)
                         {
                             continue;
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/CreateObjectMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/CreateObjectMessage.cs
@@ -247,9 +247,9 @@ internal static void CreateObject(ref NetworkManager networkManager, ulong sende
                     var clientList = hasObserverIdList && !networkObject.IsPlayerObject ? observerIds : networkManager.ConnectedClientsIds;
 
                     // Update the observers for this instance
-                    foreach (var clientId in clientList)
+                    for (int i = 0; i < clientList.Count; i++)
                     {
-                        networkObject.Observers.Add(clientId);
+                        networkObject.Observers.Add(clientList[i]);
                     }
 
                     // Mock CMB Service and forward to all clients
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/DestroyObjectMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/DestroyObjectMessage.cs
@@ -191,7 +191,7 @@ private void HandleDAHostForwardMessage(ulong senderId, ref NetworkManager netwo
                 DeferredDespawnTick = DeferredDespawnTick,
             };
             var ownerClientId = networkObject == null ? senderId : networkObject.OwnerClientId;
-            var clientIds = networkObject == null ? networkManager.ConnectedClientsIds.ToList() : networkObject.Observers.ToList();
+            var clientIds = networkObject == null ? networkManager.ConnectionManager.ConnectedClientIds : networkObject.Observers.ToList();
 
             foreach (var clientId in clientIds)
             {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs
@@ -228,7 +228,7 @@ public void Handle(ref NetworkContext context)
                     if (isServerAndDeltaForwarding)
                     {
                         m_ForwardUpdates = new Dictionary<ulong, List<int>>();
-                        foreach (var clientId in networkManager.ConnectedClientsIds)
+                        foreach (var clientId in networkManager.ConnectionManager.ConnectedClientIds)
                         {
                             if (clientId == context.SenderId || clientId == networkManager.LocalClientId || !networkObject.Observers.Contains(clientId))
                             {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/BaseRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/BaseRpcTarget.cs
@@ -11,6 +11,8 @@ public abstract class BaseRpcTarget : IDisposable
         /// The <see cref="NetworkManager"/> instance which can be used to handle sending and receiving the specific target(s)
         /// </summary>
         protected NetworkManager m_NetworkManager;
+
+        internal NetworkConnectionManager ConnectionManager;
         private bool m_Locked;
 
         internal void Lock()
@@ -26,6 +28,7 @@ internal void Unlock()
         internal BaseRpcTarget(NetworkManager manager)
         {
             m_NetworkManager = manager;
+            ConnectionManager = m_NetworkManager.ConnectionManager;
         }
 
         /// <summary>
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotAuthorityRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotAuthorityRpcTarget.cs
@@ -40,7 +40,7 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
                 }
                 else
                 {
-                    foreach (var clientId in m_NetworkManager.ConnectedClientsIds)
+                    foreach (var clientId in ConnectionManager.ConnectedClientIds)
                     {
                         if (clientId == behaviour.OwnerClientId || !networkObject.Observers.Contains(clientId))
                         {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs
@@ -43,7 +43,7 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
             }
             else
             {
-                foreach (var clientId in m_NetworkManager.ConnectedClientsIds)
+                foreach (var clientId in ConnectionManager.ConnectedClientIds)
                 {
                     if (clientId == behaviour.NetworkManager.LocalClientId)
                     {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs
@@ -64,7 +64,7 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
             }
             else
             {
-                foreach (var clientId in m_NetworkManager.ConnectedClientsIds)
+                foreach (var clientId in ConnectionManager.ConnectedClientIds)
                 {
                     if (clientId == behaviour.OwnerClientId)
                     {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs
@@ -44,7 +44,7 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
             }
             else
             {
-                foreach (var clientId in m_NetworkManager.ConnectedClientsIds)
+                foreach (var clientId in ConnectionManager.ConnectedClientIds)
                 {
                     if (clientId == NetworkManager.ServerClientId)
                     {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/RpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/RpcTarget.cs
@@ -119,10 +119,11 @@ public enum RpcTargetUse
     public class RpcTarget
     {
         private NetworkManager m_NetworkManager;
+        private NetworkConnectionManager m_ConnectionManager;
         internal RpcTarget(NetworkManager manager)
         {
             m_NetworkManager = manager;
-
+            m_ConnectionManager = manager.ConnectionManager;
             Everyone = new EveryoneRpcTarget(manager);
             Owner = new OwnerRpcTarget(manager);
             NotOwner = new NotOwnerRpcTarget(manager);
@@ -312,7 +313,7 @@ public BaseRpcTarget Not(ulong excludedClientId, RpcTargetUse use)
                 }
             }
             target.Clear();
-            foreach (var clientId in m_NetworkManager.ConnectedClientsIds)
+            foreach (var clientId in m_ConnectionManager.ConnectedClientIds)
             {
                 if (clientId != excludedClientId)
                 {
@@ -495,7 +496,7 @@ public BaseRpcTarget Not(NativeArray<ulong> excludedClientIds, RpcTargetUse use)
                 asASet.Add(clientId);
             }
 
-            foreach (var clientId in m_NetworkManager.ConnectedClientsIds)
+            foreach (var clientId in m_ConnectionManager.ConnectedClientIds)
             {
                 if (!asASet.Contains(clientId))
                 {
@@ -584,13 +585,13 @@ public BaseRpcTarget Not<T>(T excludedClientIds, RpcTargetUse use) where T : IEn
             }
             target.Clear();
 
-            using var asASet = new NativeHashSet<ulong>(m_NetworkManager.ConnectedClientsIds.Count, Allocator.Temp);
+            using var asASet = new NativeHashSet<ulong>(m_ConnectionManager.ConnectedClientIds.Count, Allocator.Temp);
             foreach (var clientId in excludedClientIds)
             {
                 asASet.Add(clientId);
             }
 
-            foreach (var clientId in m_NetworkManager.ConnectedClientsIds)
+            foreach (var clientId in m_ConnectionManager.ConnectedClientIds)
             {
                 if (!asASet.Contains(clientId))
                 {
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs
@@ -2593,7 +2593,7 @@ internal void HandleSceneEvent(ulong clientId, FastBufferReader reader)
                                 EventData = sceneEventData,
                             };
                             // Forward synchronization to client then exit early because DAHost is not the current session owner
-                            foreach (var client in NetworkManager.ConnectedClientsIds)
+                            foreach (var client in NetworkManager.ConnectionManager.ConnectedClientIds)
                             {
                                 if (client == NetworkManager.LocalClientId)
                                 {
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventProgress.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventProgress.cs
@@ -166,7 +166,7 @@ internal SceneEventProgress(NetworkManager networkManager, SceneEventProgressSta
                 {
                     m_NetworkManager.OnClientDisconnectCallback += OnClientDisconnectCallback;
                     // Track the clients that were connected when we started this event
-                    foreach (var connectedClientId in networkManager.ConnectedClientsIds)
+                    foreach (var connectedClientId in networkManager.ConnectionManager.ConnectedClientIds)
                     {
                         // Ignore the host or session owner
                         if ((!networkManager.DistributedAuthorityMode && NetworkManager.ServerClientId == connectedClientId) || (networkManager.DistributedAuthorityMode && networkManager.CurrentSessionOwner == connectedClientId))
diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
@@ -1099,7 +1099,7 @@ internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong netwo
                 }
                 else
                 {
-                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                    foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)
                     {
                         // If SpawnWithObservers is enabled, then authority does take networkObject.CheckObjectVisibility into consideration
                         if (networkObject.CheckObjectVisibility != null && !networkObject.CheckObjectVisibility.Invoke(clientId))
@@ -1695,7 +1695,9 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
                 // Otherwise send to the clients for which the object is visible
                 else
                 {
-                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                    // We keep only the client for which the object is visible
+                    // as the other clients have them already despawned
+                    foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)
                     {
                         if ((distributedAuthority && clientId == networkObject.OwnerClientId) || clientId == NetworkManager.LocalClientId)
                         {
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
diff --git a/com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef b/com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.Editor.Tests.asmdef b/com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.Editor.Tests.asmdef
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportConnectionTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportConnectionTests.cs
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef b/com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef

Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,7 @@ internal void CheckForAnimatorChanges()`
`996`	`996`	`{`
`997`	`997`	`// Just notify all remote clients and not the local server`
`998`	`998`	`m_ClientSendList.Clear();`
`999`		`- foreach (var clientId in NetworkManager.ConnectedClientsIds)`
	`999`	`+ foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)`
`1000`	`1000`	`{`
`1001`	`1001`	`if (clientId == NetworkManager.LocalClientId \|\| !NetworkObject.Observers.Contains(clientId))`
`1002`	`1002`	`{`
`@@ -1315,7 +1315,7 @@ private unsafe void SendParametersUpdateServerRpc(ParametersUpdateMessage parame`
`1315`	`1315`	`if (NetworkManager.ConnectedClientsIds.Count > (IsHost ? 2 : 1))`
`1316`	`1316`	`{`
`1317`	`1317`	`m_ClientSendList.Clear();`
`1318`		`- foreach (var clientId in NetworkManager.ConnectedClientsIds)`
	`1318`	`+ foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)`
`1319`	`1319`	`{`
`1320`	`1320`	`if (clientId == serverRpcParams.Receive.SenderClientId \|\| clientId == NetworkManager.ServerClientId \|\| !NetworkObject.Observers.Contains(clientId))`
`1321`	`1321`	`{`
`@@ -1378,7 +1378,7 @@ private void SendAnimStateServerRpc(AnimationMessage animationMessage, ServerRpc`
`1378`	`1378`	`if (NetworkManager.ConnectedClientsIds.Count > (IsHost ? 2 : 1))`
`1379`	`1379`	`{`
`1380`	`1380`	`m_ClientSendList.Clear();`
`1381`		`- foreach (var clientId in NetworkManager.ConnectedClientsIds)`
	`1381`	`+ foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)`
`1382`	`1382`	`{`
`1383`	`1383`	`if (clientId == serverRpcParams.Receive.SenderClientId \|\| clientId == NetworkManager.ServerClientId \|\| !NetworkObject.Observers.Contains(clientId))`
`1384`	`1384`	`{`
`@@ -1452,7 +1452,7 @@ internal void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerM`
`1452`	`1452`	`InternalSetTrigger(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);`
`1453`	`1453`
`1454`	`1454`	`m_ClientSendList.Clear();`
`1455`		`- foreach (var clientId in NetworkManager.ConnectedClientsIds)`
	`1455`	`+ foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)`
`1456`	`1456`	`{`
`1457`	`1457`	`if (clientId == NetworkManager.ServerClientId \|\| !NetworkObject.Observers.Contains(clientId))`
`1458`	`1458`	`{`
Original file line number	Diff line number	Diff line change
`@@ -149,12 +149,12 @@ internal void InvokeOnClientConnectedCallback(ulong clientId)`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`// Invoking connection event on non-authority local client. Need to calculate PeerIds.`
`152`		`- var peerClientIds = new NativeArray<ulong>(Math.Max(NetworkManager.ConnectedClientsIds.Count - 1, 0), Allocator.Temp);`
	`152`	`+ var peerClientIds = new NativeArray<ulong>(Math.Max(ConnectedClientIds.Count - 1, 0), Allocator.Temp);`
`153`	`153`	// `using var peerClientIds` or `using(peerClientIds)` renders it immutable...
`154`	`154`	`using var sentinel = peerClientIds;`
`155`	`155`
`156`	`156`	`var idx = 0;`
`157`		`- foreach (var peerId in NetworkManager.ConnectedClientsIds)`
	`157`	`+ foreach (var peerId in ConnectedClientIds)`
`158`	`158`	`{`
`159`	`159`	`if (peerId == NetworkManager.LocalClientId)`
`160`	`160`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1616,7 +1616,7 @@ public void NetworkHide(ulong clientId)`
`1616`	`1616`	`// Send destroy call`
`1617`	`1617`	`size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientId);`
`1618`	`1618`	`// Broadcast the destroy to all clients so they can update their observers list`
`1619`		`- foreach (var client in NetworkManager.ConnectedClientsIds)`
	`1619`	`+ foreach (var client in NetworkManager.ConnectionManager.ConnectedClientIds)`
`1620`	`1620`	`{`
`1621`	`1621`	`if (client == clientId \|\| client == NetworkManager.LocalClientId)`
`1622`	`1622`	`{`
`@@ -2363,7 +2363,7 @@ private void OnTransformParentChanged()`
`2363`	`2363`	`}`
`2364`	`2364`	`else`
`2365`	`2365`	`{`
`2366`		`- foreach (var clientId in NetworkManager.ConnectedClientsIds)`
	`2366`	`+ foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)`
`2367`	`2367`	`{`
`2368`	`2368`	`if (clientId == NetworkManager.ServerClientId)`
`2369`	`2369`	`{`
`@@ -2382,7 +2382,7 @@ private void OnTransformParentChanged()`
`2382`	`2382`	`var maxCount = NetworkManager.ConnectedClientsIds.Count;`
`2383`	`2383`	`ulong* clientIds = stackalloc ulong[maxCount];`
`2384`	`2384`	`int idx = 0;`
`2385`		`- foreach (var clientId in NetworkManager.ConnectedClientsIds)`
	`2385`	`+ foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)`
`2386`	`2386`	`{`
`2387`	`2387`	`if (clientId == NetworkManager.ServerClientId)`
`2388`	`2388`	`{`
Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,9 @@ public void Handle(ref NetworkContext context)`
`250`	`250`	`}`
`251`	`251`	`else`
`252`	`252`	`{`
`253`		`- foreach (var clientId in clientList)`
	`253`	`+ for (int i = 0; i < clientList.Count; i++)`
`254`	`254`	`{`
	`255`	`+ var clientId = clientList[i];`
`255`	`256`	`if (clientId == networkManager.LocalClientId)`
`256`	`257`	`{`
`257`	`258`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -247,9 +247,9 @@ internal static void CreateObject(ref NetworkManager networkManager, ulong sende`
`247`	`247`	`var clientList = hasObserverIdList && !networkObject.IsPlayerObject ? observerIds : networkManager.ConnectedClientsIds;`
`248`	`248`
`249`	`249`	`// Update the observers for this instance`
`250`		`- foreach (var clientId in clientList)`
	`250`	`+ for (int i = 0; i < clientList.Count; i++)`
`251`	`251`	`{`
`252`		`- networkObject.Observers.Add(clientId);`
	`252`	`+ networkObject.Observers.Add(clientList[i]);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`// Mock CMB Service and forward to all clients`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ private void HandleDAHostForwardMessage(ulong senderId, ref NetworkManager netwo`
`191`	`191`	`DeferredDespawnTick = DeferredDespawnTick,`
`192`	`192`	`};`
`193`	`193`	`var ownerClientId = networkObject == null ? senderId : networkObject.OwnerClientId;`
`194`		`- var clientIds = networkObject == null ? networkManager.ConnectedClientsIds.ToList() : networkObject.Observers.ToList();`
	`194`	`+ var clientIds = networkObject == null ? networkManager.ConnectionManager.ConnectedClientIds : networkObject.Observers.ToList();`
`195`	`195`
`196`	`196`	`foreach (var clientId in clientIds)`
`197`	`197`	`{`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public void Handle(ref NetworkContext context)`
`228`	`228`	`if (isServerAndDeltaForwarding)`
`229`	`229`	`{`
`230`	`230`	`m_ForwardUpdates = new Dictionary<ulong, List<int>>();`
`231`		`- foreach (var clientId in networkManager.ConnectedClientsIds)`
	`231`	`+ foreach (var clientId in networkManager.ConnectionManager.ConnectedClientIds)`
`232`	`232`	`{`
`233`	`233`	`if (clientId == context.SenderId \|\| clientId == networkManager.LocalClientId \|\| !networkObject.Observers.Contains(clientId))`
`234`	`234`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ public abstract class BaseRpcTarget : IDisposable`
`11`	`11`	`/// The <see cref="NetworkManager"/> instance which can be used to handle sending and receiving the specific target(s)`
`12`	`12`	`/// </summary>`
`13`	`13`	`protected NetworkManager m_NetworkManager;`
	`14`	`+`
	`15`	`+ internal NetworkConnectionManager ConnectionManager;`
`14`	`16`	`private bool m_Locked;`
`15`	`17`
`16`	`18`	`internal void Lock()`
`@@ -26,6 +28,7 @@ internal void Unlock()`
`26`	`28`	`internal BaseRpcTarget(NetworkManager manager)`
`27`	`29`	`{`
`28`	`30`	`m_NetworkManager = manager;`
	`31`	`+ ConnectionManager = m_NetworkManager.ConnectionManager;`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,`
`40`	`40`	`}`
`41`	`41`	`else`
`42`	`42`	`{`
`43`		`- foreach (var clientId in m_NetworkManager.ConnectedClientsIds)`
	`43`	`+ foreach (var clientId in ConnectionManager.ConnectedClientIds)`
`44`	`44`	`{`
`45`	`45`	`if (clientId == behaviour.OwnerClientId \|\| !networkObject.Observers.Contains(clientId))`
`46`	`46`	`{`