Fixed object destruction on disconnect

TwoTenPvP · TwoTenPvP · commit 46af7a9c9fc8 · 2018-05-25T11:34:29.000+02:00
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -1077,7 +1077,7 @@ internal void OnClientDisconnectFromServer(uint clientId)
                 if(NetworkConfig.HandleObjectSpawning)
                 {
                     if (connectedClients[clientId].PlayerObject != null)
-                        Destroy(connectedClients[clientId].PlayerObject);
+                        Destroy(connectedClients[clientId].PlayerObject.gameObject);
                     for (int i = 0; i < connectedClients[clientId].OwnedObjects.Count; i++)
                     {
                         if (connectedClients[clientId].OwnedObjects[i] != null)
diff --git a/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs b/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs
@@ -350,10 +350,11 @@ internal static void OnDestroyObject(uint networkId, bool destroyGameObject)
         {
             if (!spawnedObjects.ContainsKey(networkId) || (netManager != null && !netManager.NetworkConfig.HandleObjectSpawning))
                 return;
-            if (spawnedObjects[networkId].OwnerClientId != NetworkingManager.singleton.NetworkConfig.NetworkTransport.InvalidDummyId && !spawnedObjects[networkId].isPlayerObject)
+            if (spawnedObjects[networkId].OwnerClientId != NetworkingManager.singleton.NetworkConfig.NetworkTransport.InvalidDummyId && 
+                !spawnedObjects[networkId].isPlayerObject && netManager.connectedClients.ContainsKey(spawnedObjects[networkId].OwnerClientId))
             {
                 //Someone owns it.
-                NetworkingManager.singleton.connectedClients[spawnedObjects[networkId].OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworkId == networkId);
+                netManager.connectedClients[spawnedObjects[networkId].OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworkId == networkId);
             }
             spawnedObjects[networkId]._isSpawned = false;
 

Original file line number	Diff line number	Diff line change
`@@ -1077,7 +1077,7 @@ internal void OnClientDisconnectFromServer(uint clientId)`
`1077`	`1077`	`if(NetworkConfig.HandleObjectSpawning)`
`1078`	`1078`	`{`
`1079`	`1079`	`if (connectedClients[clientId].PlayerObject != null)`
`1080`		`- Destroy(connectedClients[clientId].PlayerObject);`
	`1080`	`+ Destroy(connectedClients[clientId].PlayerObject.gameObject);`
`1081`	`1081`	`for (int i = 0; i < connectedClients[clientId].OwnedObjects.Count; i++)`
`1082`	`1082`	`{`
`1083`	`1083`	`if (connectedClients[clientId].OwnedObjects[i] != null)`
Original file line number	Diff line number	Diff line change
`@@ -350,10 +350,11 @@ internal static void OnDestroyObject(uint networkId, bool destroyGameObject)`
`350`	`350`	`{`
`351`	`351`	`if (!spawnedObjects.ContainsKey(networkId) \|\| (netManager != null && !netManager.NetworkConfig.HandleObjectSpawning))`
`352`	`352`	`return;`
`353`		`- if (spawnedObjects[networkId].OwnerClientId != NetworkingManager.singleton.NetworkConfig.NetworkTransport.InvalidDummyId && !spawnedObjects[networkId].isPlayerObject)`
	`353`	`+ if (spawnedObjects[networkId].OwnerClientId != NetworkingManager.singleton.NetworkConfig.NetworkTransport.InvalidDummyId &&`
	`354`	`+ !spawnedObjects[networkId].isPlayerObject && netManager.connectedClients.ContainsKey(spawnedObjects[networkId].OwnerClientId))`
`354`	`355`	`{`
`355`	`356`	`//Someone owns it.`
`356`		`- NetworkingManager.singleton.connectedClients[spawnedObjects[networkId].OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworkId == networkId);`
	`357`	`+ netManager.connectedClients[spawnedObjects[networkId].OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworkId == networkId);`
`357`	`358`	`}`
`358`	`359`	`spawnedObjects[networkId]._isSpawned = false;`
`359`	`360`