Changed ConnectedClients API to a list

Author: TwoTenPvP

MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

@@ -7,7 +7,6 @@
 using MLAPI.Data;
 using MLAPI.NetworkingManagerComponents.Binary;
 using MLAPI.NetworkingManagerComponents.Core;
-using System.Collections;
 
 namespace MLAPI.MonoBehaviours.Core
 {

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

@@ -66,14 +66,15 @@ public uint MyClientId
         }
         internal uint myClientId;
         internal readonly Dictionary<uint, NetworkedClient> connectedClients = new Dictionary<uint, NetworkedClient>();
+        internal readonly List<NetworkedClient> connectedClientsList = new List<NetworkedClient>();
         /// <summary>
-        /// Gets a dictionary of connected clients
+        /// Gets a list of connected clients
         /// </summary>
-        public Dictionary<uint, NetworkedClient> ConnectedClients
+        public List<NetworkedClient> ConnectedClients
         {
             get
             {
-                return connectedClients;
+                return connectedClientsList;
             }
         }
         internal readonly HashSet<uint> pendingClients = new HashSet<uint>();
@@ -222,6 +223,7 @@ private object Init(bool server)
             eventOvershootCounter = 0f;
             pendingClients.Clear();
             connectedClients.Clear();
+            connectedClientsList.Clear();
             messageBuffer = new byte[NetworkConfig.MessageBufferSize];
             diffieHellmanPublicKeys.Clear();
             Data.Cache.messageAttributeHashes.Clear();
@@ -607,6 +609,7 @@ public void StartHost(Vector3? pos = null, Quaternion? rot = null)
             {
                 ClientId = hostClientId
             });
+            connectedClientsList.Add(connectedClients[hostClientId]);
 
             if (NetworkConfig.HandleObjectSpawning)
             {
@@ -996,6 +999,8 @@ internal void DisconnectClient(uint clientId)
 
             if (connectedClients.ContainsKey(clientId))
                 connectedClients.Remove(clientId);
+      
+            connectedClientsList.RemoveAll(x => x.ClientId == clientId); // :(
 
             if (diffieHellmanPublicKeys.ContainsKey(clientId))
                 diffieHellmanPublicKeys.Remove(clientId);
@@ -1022,6 +1027,7 @@ internal void OnClientDisconnect(uint clientId)
                             Destroy(connectedClients[clientId].OwnedObjects[i].gameObject);
                     }
                 }
+                connectedClientsList.RemoveAll(x => x.ClientId == clientId);
                 connectedClients.Remove(clientId);
             }
 
@@ -1087,6 +1093,7 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua
                     AesKey = aesKey
                 };
                 connectedClients.Add(clientId, client);
+                connectedClientsList.Add(client);
 
                 if(NetworkConfig.HandleObjectSpawning)
                 {

MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs

@@ -77,6 +77,7 @@ internal static void HandleConnectionApproved(uint clientId, BitReader reader, i
             {
                 uint _clientId = reader.ReadUInt();
                 netManager.connectedClients.Add(_clientId, new NetworkedClient() { ClientId = _clientId });
+                netManager.connectedClientsList.Add(netManager.connectedClients[_clientId]);
             }
             if (netManager.NetworkConfig.HandleObjectSpawning)
             {
@@ -149,6 +150,7 @@ internal static void HandleAddObject(uint clientId, BitReader reader, int channe
                 if (isPlayerObject)
                 {
                     netManager.connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });
+                    netManager.connectedClientsList.Add(netManager.connectedClients[ownerId]);
                     GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
                     go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                 }
@@ -337,6 +339,7 @@ internal static void HandleAddObjects(uint clientId, BitReader reader, int chann
                     if (isPlayerObject)
                     {
                         netManager.connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });
+                        netManager.connectedClientsList.Add(netManager.connectedClients[ownerId]);
                         GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
 
                         go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);