fix: Object spawning during first scene change (#222)

jaglitegrann · TwoTenPvP · commit 6df2a9118862 · 2019-05-08T18:46:48.000+02:00
diff --git a/MLAPI/Messaging/InternalMessageHandler.cs b/MLAPI/Messaging/InternalMessageHandler.cs
@@ -284,6 +284,7 @@ void DelayedSpawnAction(Stream continuationStream)
                     void OnSceneLoadComplete()
                     {
                         SceneManager.activeSceneChanged -= onSceneLoaded;
+                        NetworkSceneManager.isSpawnedObjectsPendingInDontDestroyOnLoad = false;
                         DelayedSpawnAction(continuationStream);
                     }
 
diff --git a/MLAPI/SceneManagement/NetworkSceneManager.cs b/MLAPI/SceneManagement/NetworkSceneManager.cs
@@ -147,6 +147,7 @@ internal static void OnFirstSceneSwitchSync(uint sceneIndex, Guid switchSceneGui
             nextScene = SceneManager.GetSceneByName(sceneName);
             CurrentActiveSceneIndex = sceneNameToIndex[sceneName];
 
+            isSpawnedObjectsPendingInDontDestroyOnLoad = true;
             SceneManager.LoadScene(sceneName);
             
             using (PooledBitStream stream = PooledBitStream.Get())

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ void DelayedSpawnAction(Stream continuationStream)`
`284`	`284`	`void OnSceneLoadComplete()`
`285`	`285`	`{`
`286`	`286`	`SceneManager.activeSceneChanged -= onSceneLoaded;`
	`287`	`+ NetworkSceneManager.isSpawnedObjectsPendingInDontDestroyOnLoad = false;`
`287`	`288`	`DelayedSpawnAction(continuationStream);`
`288`	`289`	`}`
`289`	`290`