charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 11:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetworkManager.StartServer: scene change check moved into IsServerOnlineSceneChangeNeeded

Browse Source
This commit is contained in:
vis2k 2019-12-31 09:26:13 +01:00
parent 39817fcf00
commit 2971345f37
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Mirror/Runtime/NetworkManager.cs
View File

@ -265,6 +265,14 @@ public virtual void LateUpdate()
#region Start & Stop
// keep the online scene change check in a separate function
bool IsServerOnlineSceneChangeNeeded()
{
// Only change scene if the requested online scene is not blank, and is not already loaded
string loadedSceneName = SceneManager.GetActiveScene().name;
return !string.IsNullOrEmpty(onlineScene) && onlineScene != loadedSceneName && onlineScene != offlineScene;
}
/// <summary>
/// This starts a new server.
/// <para>This uses the networkPort property as the listen port.</para>
@ -307,9 +315,8 @@ public bool StartServer()
if (LogFilter.Debug) Debug.Log("NetworkManager StartServer");
isNetworkActive = true;
// Only change scene if the requested online scene is not blank, and is not already loaded
string loadedSceneName = SceneManager.GetActiveScene().name;
if (!string.IsNullOrEmpty(onlineScene) && onlineScene != loadedSceneName && onlineScene != offlineScene)
// scene change needed?
if (IsServerOnlineSceneChangeNeeded())
{
ServerChangeScene(onlineScene);
}