fix: Scene objects not being replicated when joining mid scene switch

TwoTenPvP · TwoTenPvP · commit 6969fb67560b · 2019-04-17T16:11:22.000+02:00
Fixes: #182
diff --git a/MLAPI/SceneManagement/NetworkSceneManager.cs b/MLAPI/SceneManagement/NetworkSceneManager.cs
@@ -74,7 +74,6 @@ public static SceneSwitchProgress SwitchScene(string sceneName)
             }
             
             SpawnManager.ServerDestroySpawnedSceneObjects(); //Destroy current scene objects before switching.
-            currentSceneIndex = sceneNameToIndex[sceneName];
             isSwitching = true;
             lastScene = SceneManager.GetActiveScene();
 
@@ -171,6 +170,8 @@ private static void OnSceneLoaded(Guid switchSceneGuid, Stream objectStream)
             MoveObjectsToScene(nextScene);
             
             isSpawnedObjectsPendingInDontDestroyOnLoad = false;
+            
+            currentSceneIndex = CurrentActiveSceneIndex;
 
             if (NetworkingManager.Singleton.IsServer)
             {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ public static SceneSwitchProgress SwitchScene(string sceneName)`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`SpawnManager.ServerDestroySpawnedSceneObjects(); //Destroy current scene objects before switching.`
`77`		`- currentSceneIndex = sceneNameToIndex[sceneName];`
`78`	`77`	`isSwitching = true;`
`79`	`78`	`lastScene = SceneManager.GetActiveScene();`
`80`	`79`
`@@ -171,6 +170,8 @@ private static void OnSceneLoaded(Guid switchSceneGuid, Stream objectStream)`
`171`	`170`	`MoveObjectsToScene(nextScene);`
`172`	`171`
`173`	`172`	`isSpawnedObjectsPendingInDontDestroyOnLoad = false;`
	`173`	`+`
	`174`	`+ currentSceneIndex = CurrentActiveSceneIndex;`
`174`	`175`
`175`	`176`	`if (NetworkingManager.Singleton.IsServer)`
`176`	`177`	`{`