fix: Spawning objects during scene switch

Author: TwoTenPvP

MLAPI/SceneManagement/NetworkSceneManager.cs

@@ -37,6 +37,7 @@ public static class NetworkSceneManager
         private static bool isSwitching = false;
         internal static uint currentSceneIndex = 0;
         internal static Guid currentSceneSwitchProgressGuid = new Guid();
+        internal static bool isSpawnedObjectsPendingInDontDestroyOnLoad = false;
 
         internal static void SetCurrentSceneIndex()
         {
@@ -113,6 +114,8 @@ internal static void OnSceneSwitch(uint sceneIndex, Guid switchSceneGuid, Stream
 
             // Move ALL networked objects to the temp scene
             MoveObjectsToDontDestroyOnLoad();
+            
+            isSpawnedObjectsPendingInDontDestroyOnLoad = true;
 
             string sceneName = sceneIndexToString[sceneIndex];
 
@@ -164,6 +167,8 @@ private static void OnSceneLoaded(Guid switchSceneGuid, Stream objectStream)
 
             // Move all objects to the new scene
             MoveObjectsToScene(nextScene);
+            
+            isSpawnedObjectsPendingInDontDestroyOnLoad = false;
 
             if (NetworkingManager.Singleton.IsServer)
             {

MLAPI/Spawning/SpawnManager.cs

@@ -7,6 +7,7 @@
 using MLAPI.Internal;
 using MLAPI.Logging;
 using MLAPI.Messaging;
+using MLAPI.SceneManagement;
 using MLAPI.Security;
 using MLAPI.Serialization;
 using MLAPI.Serialization.Pooled;
@@ -240,12 +241,27 @@ internal static NetworkedObject CreateLocalNetworkedObject(bool softCreate, ulon
                 // Create the object
                 if (customSpawnHandlers.ContainsKey(prefabHash))
                 {
-                    return customSpawnHandlers[prefabHash](position.GetValueOrDefault(Vector3.zero), rotation.GetValueOrDefault(Quaternion.identity));
+                    NetworkedObject networkedObject = customSpawnHandlers[prefabHash](position.GetValueOrDefault(Vector3.zero), rotation.GetValueOrDefault(Quaternion.identity));
+                    
+                    if (NetworkSceneManager.isSpawnedObjectsPendingInDontDestroyOnLoad)
+                    {
+                        GameObject.DontDestroyOnLoad(networkedObject.gameObject);
+                    }
+
+                    return networkedObject;
                 }
                 else
                 {
                     GameObject prefab = NetworkingManager.Singleton.NetworkConfig.NetworkedPrefabs[GetNetworkedPrefabIndexOfHash(prefabHash)].Prefab;
-                    return ((position == null && rotation == null) ? MonoBehaviour.Instantiate(prefab) : MonoBehaviour.Instantiate(prefab, position.GetValueOrDefault(Vector3.zero), rotation.GetValueOrDefault(Quaternion.identity))).GetComponent<NetworkedObject>();
+                    
+                    NetworkedObject networkedObject = ((position == null && rotation == null) ? MonoBehaviour.Instantiate(prefab) : MonoBehaviour.Instantiate(prefab, position.GetValueOrDefault(Vector3.zero), rotation.GetValueOrDefault(Quaternion.identity))).GetComponent<NetworkedObject>();
+                    
+                    if (NetworkSceneManager.isSpawnedObjectsPendingInDontDestroyOnLoad)
+                    {
+                        GameObject.DontDestroyOnLoad(networkedObject.gameObject);
+                    }
+                    
+                    return networkedObject;
                 }
             }
             else