GabrielTofvesson/MLAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed list of spawned object ids

Browse Source
This commit is contained in:
Albin Corén 2018-01-07 06:43:04 +01:00
parent bde2f0f3af
commit 4ad74c74b3
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
MLAPI/MonoBehaviours/Core/NetworkingManager.cs
View File

@ -48,7 +48,6 @@ namespace MLAPI
return spawnedObjects; return spawnedObjects;
} }
} }
public List<uint> spawnedObjectIds;
private Stack<uint> releasedNetworkObjectIds; private Stack<uint> releasedNetworkObjectIds;
private uint networkObjectIdCounter; private uint networkObjectIdCounter;
private uint GetNetworkObjectId() private uint GetNetworkObjectId()
@ -98,7 +97,6 @@ namespace MLAPI
} }
netObject.OwnerClientId = ownerId; netObject.OwnerClientId = ownerId;
singleton.spawnedObjectIds.Add(netObject.NetworkId);
singleton.spawnedObjects.Add(netObject.NetworkId, netObject); singleton.spawnedObjects.Add(netObject.NetworkId, netObject);
return go; return go;
} }
@ -123,7 +121,6 @@ namespace MLAPI
} }
netObject.IsPlayerObject = true; netObject.IsPlayerObject = true;
connectedClients[clientId].PlayerObject = go; connectedClients[clientId].PlayerObject = go;
singleton.spawnedObjectIds.Add(netObject.NetworkId);
singleton.spawnedObjects.Add(netObject.NetworkId, netObject); singleton.spawnedObjects.Add(netObject.NetworkId, netObject);
return go; return go;
} }
@ -221,7 +218,6 @@ namespace MLAPI
messageHandlerCounter = new Dictionary<ushort, int>(); messageHandlerCounter = new Dictionary<ushort, int>();
releasedMessageHandlerCounters = new Dictionary<ushort, Stack<int>>(); releasedMessageHandlerCounters = new Dictionary<ushort, Stack<int>>();
spawnedObjects = new Dictionary<uint, NetworkedObject>(); spawnedObjects = new Dictionary<uint, NetworkedObject>();
spawnedObjectIds = new List<uint>();
releasedNetworkObjectIds = new Stack<uint>(); releasedNetworkObjectIds = new Stack<uint>();
if (NetworkConfig.HandleObjectSpawning) if (NetworkConfig.HandleObjectSpawning)
{ {
@ -230,7 +226,6 @@ namespace MLAPI
{ {
uint networkId = GetNetworkObjectId(); uint networkId = GetNetworkObjectId();
spawnedObjects.Add(networkId, sceneObjects[i]); spawnedObjects.Add(networkId, sceneObjects[i]);
spawnedObjectIds.Add(networkId);
} }
} }
@ -806,22 +801,28 @@ namespace MLAPI
if (NetworkConfig.HandleObjectSpawning) if (NetworkConfig.HandleObjectSpawning)
{ {
int amountOfObjectsToSend = 0; 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; continue;
else else
amountOfObjectsToSend++; amountOfObjectsToSend++;
} }
writer.Write(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; continue;
writer.Write(spawnedObjects[spawnedObjectIds[i]].IsPlayerObject); else
writer.Write(spawnedObjects[spawnedObjectIds[i]].NetworkId); amountOfObjectsToSend++;
writer.Write(spawnedObjects[spawnedObjectIds[i]].OwnerClientId);
writer.Write(spawnedObjects[spawnedObjectIds[i]].SpawnablePrefabId); 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);
} }
} }
} }