ForceReload is always true, and the only use of it requred it to be f…

…alse, so it's no longer needed. (MirrorNetworking#970)
ZaidRedEye · Jul 20, 2019 · 7fecfe3 · 7fecfe3
1 parent 3fb0337
commit 7fecfe3
Showing 1 changed file with 5 additions and 15 deletions.
diff --git a/Assets/Mirror/Runtime/NetworkManager.cs b/Assets/Mirror/Runtime/NetworkManager.cs
@@ -19,7 +19,6 @@ public enum PlayerSpawnMethod
     [HelpURL("https://vis2k.github.io/Mirror/Components/NetworkManager")]
     public class NetworkManager : MonoBehaviour
     {
-
         // configuration
         [FormerlySerializedAs("m_DontDestroyOnLoad")] public bool dontDestroyOnLoad = true;
         [FormerlySerializedAs("m_RunInBackground")] public bool runInBackground = true;
@@ -411,7 +410,7 @@ public void StopClient()
             if (!string.IsNullOrEmpty(offlineScene))
             {
                 // Must pass true or offlineScene will not be loaded
-                ClientChangeScene(offlineScene, true);
+                ClientChangeScene(offlineScene);
             }
             CleanupNetworkIdentities();
         }
@@ -458,12 +457,12 @@ void CleanupNetworkIdentities()
             }
         }
 
-        void ClientChangeScene(string newSceneName, bool forceReload)
+        void ClientChangeScene(string newSceneName)
         {
-            ClientChangeScene(newSceneName, forceReload, LoadSceneMode.Single, LocalPhysicsMode.None);
+            ClientChangeScene(newSceneName, LoadSceneMode.Single, LocalPhysicsMode.None);
         }
 
-        internal void ClientChangeScene(string newSceneName, bool forceReload, LoadSceneMode sceneMode, LocalPhysicsMode physicsMode)
+        internal void ClientChangeScene(string newSceneName, LoadSceneMode sceneMode, LocalPhysicsMode physicsMode)
         {
             if (string.IsNullOrEmpty(newSceneName))
             {
@@ -473,15 +472,6 @@ internal void ClientChangeScene(string newSceneName, bool forceReload, LoadScene
 
             if (LogFilter.Debug) Debug.Log("ClientChangeScene newSceneName:" + newSceneName + " networkSceneName:" + networkSceneName);
 
-            if (newSceneName == networkSceneName)
-            {
-                if (!forceReload)
-                {
-                    FinishLoadScene();
-                    return;
-                }
-            }
-
             // vis2k: pause message handling while loading scene. otherwise we will process messages and then lose all
             // the state as soon as the load is finishing, causing all kinds of bugs because of missing state.
             // (client may be null after StopClient etc.)
@@ -671,7 +661,7 @@ void OnClientSceneInternal(NetworkConnection conn, SceneMessage msg)
 
             if (NetworkClient.isConnected && !NetworkServer.active)
             {
-                ClientChangeScene(msg.sceneName, true, msg.sceneMode, msg.physicsMode);
+                ClientChangeScene(msg.sceneName, msg.sceneMode, msg.physicsMode);
             }
         }
         #endregion