update

NoelStephensUnity · NoelStephensUnity · commit f3ef1afee4ab · 2025-08-14T17:40:01.000-05:00
applying the fixes from #3527 where applicable.
diff --git a/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs b/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs
@@ -961,7 +961,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))
                         {
@@ -1320,7 +1320,7 @@ private unsafe void SendAnimStateServerRpc(AnimationMessage animationMessage, Se
                 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))
                         {
diff --git a/com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs b/com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs
@@ -134,12 +134,12 @@ internal void InvokeOnClientConnectedCallback(ulong clientId)
 
             if (!NetworkManager.IsServer)
             {
-                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
@@ -1252,10 +1252,10 @@ private void OnTransformParentChanged()
 
             unsafe
             {
-                var maxCount = NetworkManager.ConnectedClientsIds.Count;
+                var maxCount = NetworkManager.ConnectionManager.ConnectedClientIds.Count;
                 ulong* clientIds = stackalloc ulong[maxCount];
                 int idx = 0;
-                foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)
                 {
                     if (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,7 @@ 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 +27,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/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
@@ -55,7 +55,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
@@ -107,9 +107,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);
@@ -284,8 +286,9 @@ public BaseRpcTarget Not(ulong excludedClientId, RpcTargetUse use)
                     target = m_CachedProxyRpcTargetGroup;
                 }
             }
+
             target.Clear();
-            foreach (var clientId in m_NetworkManager.ConnectedClientsIds)
+            foreach (var clientId in m_ConnectionManager.ConnectedClientIds)
             {
                 if (clientId != excludedClientId)
                 {
@@ -468,7 +471,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))
                 {
@@ -557,13 +560,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
@@ -829,7 +829,7 @@ internal NetworkSceneManager(NetworkManager networkManager)
         private void SceneManager_ActiveSceneChanged(Scene current, Scene next)
         {
             // If no clients are connected, then don't worry about notifications
-            if (!(NetworkManager.ConnectedClientsIds.Count > (NetworkManager.IsHost ? 1 : 0)))
+            if (!(NetworkManager.ConnectionManager.ConnectedClientIds.Count > (NetworkManager.IsHost ? 1 : 0)))
             {
                 return;
             }
@@ -850,7 +850,7 @@ private void SceneManager_ActiveSceneChanged(Scene current, Scene next)
                 var sceneEvent = BeginSceneEvent();
                 sceneEvent.SceneEventType = SceneEventType.ActiveSceneChanged;
                 sceneEvent.ActiveSceneHash = BuildIndexToHash[next.buildIndex];
-                SendSceneEventData(sceneEvent.SceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != NetworkManager.ServerClientId).ToArray());
+                SendSceneEventData(sceneEvent.SceneEventId, NetworkManager.ConnectionManager.ConnectedClientIds.Where(c => c != NetworkManager.ServerClientId).ToArray());
                 EndSceneEvent(sceneEvent.SceneEventId);
             }
         }
@@ -1139,10 +1139,10 @@ private bool OnSceneEventProgressCompleted(SceneEventProgress sceneEventProgress
             {
                 EventData = sceneEventData
             };
-            var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, NetworkManager.ConnectedClientsIds);
+            var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, NetworkManager.ConnectionManager.ConnectedClientIds);
 
             NetworkManager.NetworkMetrics.TrackSceneEventSent(
-                NetworkManager.ConnectedClientsIds,
+                NetworkManager.ConnectionManager.ConnectedClientIds,
                 (uint)sceneEventProgress.SceneEventType,
                 SceneNameFromHash(sceneEventProgress.SceneHash),
                 size);
@@ -1291,7 +1291,7 @@ private void OnSceneUnloaded(uint sceneEventId)
                 // Server sends the unload scene notification after unloading because it will despawn all scene relative in-scene NetworkObjects
                 // If we send this event to all clients before the server is finished unloading they will get warning about an object being
                 // despawned that no longer exists
-                SendSceneEventData(sceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != NetworkManager.ServerClientId).ToArray());
+                SendSceneEventData(sceneEventId, NetworkManager.ConnectionManager.ConnectedClientIds.Where(c => c != NetworkManager.ServerClientId).ToArray());
 
                 //Only if we are a host do we want register having loaded for the associated SceneEventProgress
                 if (SceneEventProgressTracking.ContainsKey(sceneEventData.SceneEventProgressId) && NetworkManager.IsHost)
@@ -2515,7 +2515,7 @@ internal void CheckForAndSendNetworkObjectSceneChanged()
             // Some NetworkObjects still exist, send the message
             var sceneEvent = BeginSceneEvent();
             sceneEvent.SceneEventType = SceneEventType.ObjectSceneChanged;
-            SendSceneEventData(sceneEvent.SceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != NetworkManager.ServerClientId).ToArray());
+            SendSceneEventData(sceneEvent.SceneEventId, NetworkManager.ConnectionManager.ConnectedClientIds.Where(c => c != NetworkManager.ServerClientId).ToArray());
             EndSceneEvent(sceneEvent.SceneEventId);
         }
 
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventProgress.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventProgress.cs
@@ -162,7 +162,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 client
                         if (NetworkManager.ServerClientId == connectedClientId)
diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
@@ -1169,7 +1169,7 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
 
                         // We keep only the client for which the object is visible
                         // as the other clients have them already despawned
-                        foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                        foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)
                         {
                             if (networkObject.IsNetworkVisibleTo(clientId))
                             {

Original file line number	Diff line number	Diff line change
`@@ -961,7 +961,7 @@ internal void CheckForAnimatorChanges()`
`961`	`961`	`{`
`962`	`962`	`// Just notify all remote clients and not the local server`
`963`	`963`	`m_ClientSendList.Clear();`
`964`		`- foreach (var clientId in NetworkManager.ConnectedClientsIds)`
	`964`	`+ foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)`
`965`	`965`	`{`
`966`	`966`	`if (clientId == NetworkManager.LocalClientId \|\| !NetworkObject.Observers.Contains(clientId))`
`967`	`967`	`{`
`@@ -1320,7 +1320,7 @@ private unsafe void SendAnimStateServerRpc(AnimationMessage animationMessage, Se`
`1320`	`1320`	`if (NetworkManager.ConnectedClientsIds.Count > (IsHost ? 2 : 1))`
`1321`	`1321`	`{`
`1322`	`1322`	`m_ClientSendList.Clear();`
`1323`		`- foreach (var clientId in NetworkManager.ConnectedClientsIds)`
	`1323`	`+ foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)`
`1324`	`1324`	`{`
`1325`	`1325`	`if (clientId == serverRpcParams.Receive.SenderClientId \|\| clientId == NetworkManager.ServerClientId \|\| !NetworkObject.Observers.Contains(clientId))`
`1326`	`1326`	`{`
Original file line number	Diff line number	Diff line change
`@@ -134,12 +134,12 @@ internal void InvokeOnClientConnectedCallback(ulong clientId)`
`134`	`134`
`135`	`135`	`if (!NetworkManager.IsServer)`
`136`	`136`	`{`
`137`		`- var peerClientIds = new NativeArray<ulong>(Math.Max(NetworkManager.ConnectedClientsIds.Count - 1, 0), Allocator.Temp);`
	`137`	`+ var peerClientIds = new NativeArray<ulong>(Math.Max(ConnectedClientIds.Count - 1, 0), Allocator.Temp);`
`138`	`138`	// `using var peerClientIds` or `using(peerClientIds)` renders it immutable...
`139`	`139`	`using var sentinel = peerClientIds;`
`140`	`140`
`141`	`141`	`var idx = 0;`
`142`		`- foreach (var peerId in NetworkManager.ConnectedClientsIds)`
	`142`	`+ foreach (var peerId in ConnectedClientIds)`
`143`	`143`	`{`
`144`	`144`	`if (peerId == NetworkManager.LocalClientId)`
`145`	`145`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1252,10 +1252,10 @@ private void OnTransformParentChanged()`
`1252`	`1252`
`1253`	`1253`	`unsafe`
`1254`	`1254`	`{`
`1255`		`- var maxCount = NetworkManager.ConnectedClientsIds.Count;`
	`1255`	`+ var maxCount = NetworkManager.ConnectionManager.ConnectedClientIds.Count;`
`1256`	`1256`	`ulong* clientIds = stackalloc ulong[maxCount];`
`1257`	`1257`	`int idx = 0;`
`1258`		`- foreach (var clientId in NetworkManager.ConnectedClientsIds)`
	`1258`	`+ foreach (var clientId in NetworkManager.ConnectionManager.ConnectedClientIds)`
`1259`	`1259`	`{`
`1260`	`1260`	`if (Observers.Contains(clientId))`
`1261`	`1261`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ 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`	`+ internal NetworkConnectionManager ConnectionManager;`
`14`	`15`	`private bool m_Locked;`
`15`	`16`
`16`	`17`	`internal void Lock()`
`@@ -26,6 +27,7 @@ internal void Unlock()`
`26`	`27`	`internal BaseRpcTarget(NetworkManager manager)`
`27`	`28`	`{`
`28`	`29`	`m_NetworkManager = manager;`
	`30`	`+ ConnectionManager = m_NetworkManager.ConnectionManager;`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,`
`43`	`43`	`}`
`44`	`44`	`else`
`45`	`45`	`{`
`46`		`- foreach (var clientId in m_NetworkManager.ConnectedClientsIds)`
	`46`	`+ foreach (var clientId in ConnectionManager.ConnectedClientIds)`
`47`	`47`	`{`
`48`	`48`	`if (clientId == behaviour.NetworkManager.LocalClientId)`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,`
`55`	`55`	`}`
`56`	`56`	`else`
`57`	`57`	`{`
`58`		`- foreach (var clientId in m_NetworkManager.ConnectedClientsIds)`
	`58`	`+ foreach (var clientId in ConnectionManager.ConnectedClientIds)`
`59`	`59`	`{`
`60`	`60`	`if (clientId == behaviour.OwnerClientId)`
`61`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,`
`44`	`44`	`}`
`45`	`45`	`else`
`46`	`46`	`{`
`47`		`- foreach (var clientId in m_NetworkManager.ConnectedClientsIds)`
	`47`	`+ foreach (var clientId in ConnectionManager.ConnectedClientIds)`
`48`	`48`	`{`
`49`	`49`	`if (clientId == NetworkManager.ServerClientId)`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -107,9 +107,11 @@ public enum RpcTargetUse`
`107`	`107`	`public class RpcTarget`
`108`	`108`	`{`
`109`	`109`	`private NetworkManager m_NetworkManager;`
	`110`	`+ private NetworkConnectionManager m_ConnectionManager;`
`110`	`111`	`internal RpcTarget(NetworkManager manager)`
`111`	`112`	`{`
`112`	`113`	`m_NetworkManager = manager;`
	`114`	`+ m_ConnectionManager = manager.ConnectionManager;`
`113`	`115`
`114`	`116`	`Everyone = new EveryoneRpcTarget(manager);`
`115`	`117`	`Owner = new OwnerRpcTarget(manager);`
`@@ -284,8 +286,9 @@ public BaseRpcTarget Not(ulong excludedClientId, RpcTargetUse use)`
`284`	`286`	`target = m_CachedProxyRpcTargetGroup;`
`285`	`287`	`}`
`286`	`288`	`}`
	`289`	`+`
`287`	`290`	`target.Clear();`
`288`		`- foreach (var clientId in m_NetworkManager.ConnectedClientsIds)`
	`291`	`+ foreach (var clientId in m_ConnectionManager.ConnectedClientIds)`
`289`	`292`	`{`
`290`	`293`	`if (clientId != excludedClientId)`
`291`	`294`	`{`
`@@ -468,7 +471,7 @@ public BaseRpcTarget Not(NativeArray<ulong> excludedClientIds, RpcTargetUse use)`
`468`	`471`	`asASet.Add(clientId);`
`469`	`472`	`}`
`470`	`473`
`471`		`- foreach (var clientId in m_NetworkManager.ConnectedClientsIds)`
	`474`	`+ foreach (var clientId in m_ConnectionManager.ConnectedClientIds)`
`472`	`475`	`{`
`473`	`476`	`if (!asASet.Contains(clientId))`
`474`	`477`	`{`
`@@ -557,13 +560,13 @@ public BaseRpcTarget Not<T>(T excludedClientIds, RpcTargetUse use) where T : IEn`
`557`	`560`	`}`
`558`	`561`	`target.Clear();`
`559`	`562`
`560`		`- using var asASet = new NativeHashSet<ulong>(m_NetworkManager.ConnectedClientsIds.Count, Allocator.Temp);`
	`563`	`+ using var asASet = new NativeHashSet<ulong>(m_ConnectionManager.ConnectedClientIds.Count, Allocator.Temp);`
`561`	`564`	`foreach (var clientId in excludedClientIds)`
`562`	`565`	`{`
`563`	`566`	`asASet.Add(clientId);`
`564`	`567`	`}`
`565`	`568`
`566`		`- foreach (var clientId in m_NetworkManager.ConnectedClientsIds)`
	`569`	`+ foreach (var clientId in m_ConnectionManager.ConnectedClientIds)`
`567`	`570`	`{`
`568`	`571`	`if (!asASet.Contains(clientId))`
`569`	`572`	`{`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ internal SceneEventProgress(NetworkManager networkManager, SceneEventProgressSta`
`162`	`162`	`{`
`163`	`163`	`m_NetworkManager.OnClientDisconnectCallback += OnClientDisconnectCallback;`
`164`	`164`	`// Track the clients that were connected when we started this event`
`165`		`- foreach (var connectedClientId in networkManager.ConnectedClientsIds)`
	`165`	`+ foreach (var connectedClientId in networkManager.ConnectionManager.ConnectedClientIds)`
`166`	`166`	`{`
`167`	`167`	`// Ignore the host client`
`168`	`168`	`if (NetworkManager.ServerClientId == connectedClientId)`