From 4ad74c74b30bcd077aa56e06d0b75b088e7aae00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Cor=C3=A9n?= <2108U9@gmail.com>
Date: Sun, 7 Jan 2018 06:43:04 +0100
Subject: [PATCH] Removed list of spawned object ids

---
 .../MonoBehaviours/Core/NetworkingManager.cs  | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
index ea0fa8c..49bd49f 100644
--- a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
+++ b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -48,7 +48,6 @@ namespace MLAPI
                 return spawnedObjects;
             }
         }
-        public List<uint> spawnedObjectIds;
         private Stack<uint> releasedNetworkObjectIds;
         private uint networkObjectIdCounter;
         private uint GetNetworkObjectId()
@@ -98,7 +97,6 @@ namespace MLAPI
             }
             netObject.OwnerClientId = ownerId;
 
-            singleton.spawnedObjectIds.Add(netObject.NetworkId);
             singleton.spawnedObjects.Add(netObject.NetworkId, netObject);
             return go;
         }
@@ -123,7 +121,6 @@ namespace MLAPI
             }
             netObject.IsPlayerObject = true;
             connectedClients[clientId].PlayerObject = go;
-            singleton.spawnedObjectIds.Add(netObject.NetworkId);
             singleton.spawnedObjects.Add(netObject.NetworkId, netObject);
             return go;
         }
@@ -221,7 +218,6 @@ namespace MLAPI
             messageHandlerCounter = new Dictionary<ushort, int>();
             releasedMessageHandlerCounters = new Dictionary<ushort, Stack<int>>();
             spawnedObjects = new Dictionary<uint, NetworkedObject>();
-            spawnedObjectIds = new List<uint>();
             releasedNetworkObjectIds = new Stack<uint>();
             if (NetworkConfig.HandleObjectSpawning)
             {
@@ -230,7 +226,6 @@ namespace MLAPI
                 {
                     uint networkId = GetNetworkObjectId();
                     spawnedObjects.Add(networkId, sceneObjects[i]);
-                    spawnedObjectIds.Add(networkId);
                 }
             }
 
@@ -806,22 +801,28 @@ namespace MLAPI
                         if (NetworkConfig.HandleObjectSpawning)
                         {
                             int amountOfObjectsToSend = 0;
-                            for (int i = 0; i < spawnedObjectIds.Count; i++)
+                            foreach (KeyValuePair<uint, NetworkedObject> pair in spawnedObjects)
                             {
-                                if (spawnedObjects[spawnedObjectIds[i]].ServerOnly)
+                                if (pair.Value.ServerOnly)
                                     continue;
                                 else
                                     amountOfObjectsToSend++;
                             }
                             writer.Write(amountOfObjectsToSend);
-                            for (int i = 0; i < spawnedObjectIds.Count; i++)
+
+                            foreach (KeyValuePair<uint, NetworkedObject> pair in spawnedObjects)
                             {
-                                if (spawnedObjects[spawnedObjectIds[i]].ServerOnly)
+                                if (pair.Value.ServerOnly)
                                     continue;
-                                writer.Write(spawnedObjects[spawnedObjectIds[i]].IsPlayerObject);
-                                writer.Write(spawnedObjects[spawnedObjectIds[i]].NetworkId);
-                                writer.Write(spawnedObjects[spawnedObjectIds[i]].OwnerClientId);
-                                writer.Write(spawnedObjects[spawnedObjectIds[i]].SpawnablePrefabId);
+                                else
+                                    amountOfObjectsToSend++;
+
+                                if (pair.Value.ServerOnly)
+                                    continue;
+                                writer.Write(pair.Value.IsPlayerObject);
+                                writer.Write(pair.Value.NetworkId);
+                                writer.Write(pair.Value.OwnerClientId);
+                                writer.Write(pair.Value.SpawnablePrefabId);
                             }
                         }
                     }