Fixed an issue where old scene networked objects would not get destroyed & added position sync to spawn

Author: TwoTenPvP

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

@@ -752,6 +752,7 @@ private void HandleIncomingData(int clientId, byte[] data, int channelId)
                                             }
                                             if(NetworkConfig.HandleObjectSpawning)
                                             {
+                                                SpawnManager.DestroyUnspawnedObjects();
                                                 int objectCount = messageReader.ReadInt32();
                                                 for (int i = 0; i < objectCount; i++)
                                                 {
@@ -760,13 +761,24 @@ private void HandleIncomingData(int clientId, byte[] data, int channelId)
                                                     int ownerId = messageReader.ReadInt32();
                                                     int prefabId = messageReader.ReadInt32();
                                                     bool isActive = messageReader.ReadBoolean();
-                                                    if(isPlayerObject)
+
+                                                    float xPos = messageReader.ReadSingle();
+                                                    float yPos = messageReader.ReadSingle();
+                                                    float zPos = messageReader.ReadSingle();
+
+                                                    float xRot = messageReader.ReadSingle();
+                                                    float yRot = messageReader.ReadSingle();
+                                                    float zRot = messageReader.ReadSingle();
+
+                                                    if (isPlayerObject)
                                                     {
                                                         SpawnManager.SpawnPlayerObject(ownerId, networkId);
                                                     }
                                                     else
                                                     {
-                                                        GameObject go = SpawnManager.SpawnObject(prefabId, networkId, ownerId);
+                                                        GameObject go = SpawnManager.SpawnObject(prefabId, networkId, ownerId, 
+                                                            new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
+
                                                         go.SetActive(isActive);
                                                     }
                                                 }
@@ -798,14 +810,23 @@ private void HandleIncomingData(int clientId, byte[] data, int channelId)
                                                 int ownerId = messageReader.ReadInt32();
                                                 int prefabId = messageReader.ReadInt32();
 
+                                                float xPos = messageReader.ReadSingle();
+                                                float yPos = messageReader.ReadSingle();
+                                                float zPos = messageReader.ReadSingle();
+
+                                                float xRot = messageReader.ReadSingle();
+                                                float yRot = messageReader.ReadSingle();
+                                                float zRot = messageReader.ReadSingle();
+
                                                 if (isPlayerObject)
                                                 {
                                                     connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });
                                                     SpawnManager.SpawnPlayerObject(ownerId, networkId);
                                                 }
                                                 else
                                                 {
-                                                    SpawnManager.SpawnObject(prefabId, networkId, ownerId);
+                                                    SpawnManager.SpawnObject(prefabId, networkId, ownerId,
+                                                        new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
                                                 }
                                             }
                                             else
@@ -1504,6 +1525,14 @@ private void HandleApproval(int clientId, bool approved)
                                 writer.Write(pair.Value.OwnerClientId);
                                 writer.Write(pair.Value.SpawnablePrefabIndex);
                                 writer.Write(pair.Value.gameObject.activeInHierarchy);
+
+                                writer.Write(pair.Value.transform.position.x);
+                                writer.Write(pair.Value.transform.position.y);
+                                writer.Write(pair.Value.transform.position.z);
+
+                                writer.Write(pair.Value.transform.rotation.x);
+                                writer.Write(pair.Value.transform.rotation.y);
+                                writer.Write(pair.Value.transform.rotation.z);
                             }
                         }
                     }

MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs

@@ -65,7 +65,17 @@ internal static void ChangeOwnership(uint netId, int clientId)
             }
         }
 
-        internal static GameObject SpawnObject(int spawnablePrefabIndex, uint networkId, int ownerId)
+        internal static void DestroyUnspawnedObjects()
+        {
+            NetworkedObject[] netObjects = MonoBehaviour.FindObjectsOfType<NetworkedObject>();
+            for (int i = 0; i < netObjects.Length; i++)
+            {
+                if (!netObjects[i].isSpawned)
+                    MonoBehaviour.Destroy(netObjects[i].gameObject);
+            }
+        }
+
+        internal static GameObject SpawnObject(int spawnablePrefabIndex, uint networkId, int ownerId, Vector3 position, Quaternion rotation)
         {
             GameObject go = MonoBehaviour.Instantiate(netManager.SpawnablePrefabs[spawnablePrefabIndex]);
             NetworkedObject netObject = go.GetComponent<NetworkedObject>();
@@ -84,6 +94,8 @@ internal static GameObject SpawnObject(int spawnablePrefabIndex, uint networkId,
                 netObject.networkId = networkId;
             }
             netObject.ownerClientId = ownerId;
+            netObject.transform.position = position;
+            netObject.transform.rotation = rotation;
 
             spawnedObjects.Add(netObject.NetworkId, netObject);
             netObject.InvokeBehaviourNetworkSpawn();
@@ -193,6 +205,14 @@ internal static void OnSpawnObject(NetworkedObject netObject, int? clientOwnerId
                     writer.Write(netObject.NetworkId);
                     writer.Write(netObject.OwnerClientId);
                     writer.Write(netObject.SpawnablePrefabIndex);
+
+                    writer.Write(netObject.transform.position.x);
+                    writer.Write(netObject.transform.position.y);
+                    writer.Write(netObject.transform.position.z);
+
+                    writer.Write(netObject.transform.rotation.x);
+                    writer.Write(netObject.transform.rotation.y);
+                    writer.Write(netObject.transform.rotation.z);
                 }
 
                 netManager.Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", stream.GetBuffer());