feat: make networkscenemanager optional again (#595)

* only assign listeners if networkscenemanager not null * feat: no networkscenemanager present spawn player after authenticate * fix nre when nsm is missing * unregister on destroy
MirageNet · Feb 17, 2021 · ed180ff · ed180ff
1 parent 7d7b53d
commit ed180ff
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/Assets/Mirage/Runtime/PlayerSpawner.cs b/Assets/Mirage/Runtime/PlayerSpawner.cs
@@ -35,7 +35,15 @@ public virtual void Start()
             }
             if (Client != null)
             {
-                SceneManager.ClientSceneChanged.AddListener(OnClientSceneChanged);
+                if(SceneManager != null)
+                {
+                    SceneManager.ClientSceneChanged.AddListener(OnClientSceneChanged);
+                }
+                else
+                {
+                    Client.Authenticated.AddListener(c => Client.Send(new AddPlayerMessage()));
+                }
+
                 if(ClientObjectManager != null)
                 {
                     ClientObjectManager.RegisterPrefab(PlayerPrefab);
@@ -57,9 +65,10 @@ public virtual void Start()
 
         void OnDestroy()
         {
-            if (Client != null)
+            if (Client != null && SceneManager != null)
             {
                 SceneManager.ClientSceneChanged.RemoveListener(OnClientSceneChanged);
+                Client.Authenticated.RemoveListener(c => Client.Send(new AddPlayerMessage()));
             }
             if (Server != null)
             {

diff --git a/Assets/Mirage/Runtime/ServerObjectManager.cs b/Assets/Mirage/Runtime/ServerObjectManager.cs
@@ -67,8 +67,12 @@ public void Start()
                 Server.OnStartHost.AddListener(StartedHost);
                 Server.Authenticated.AddListener(OnAuthenticated);
                 Server.Stopped.AddListener(OnServerStopped);
-                NetworkSceneManager.ServerChangeScene.AddListener(OnServerChangeScene);
-                NetworkSceneManager.ServerSceneChanged.AddListener(OnServerSceneChanged);
+
+                if(NetworkSceneManager != null)
+                {
+                    NetworkSceneManager.ServerChangeScene.AddListener(OnServerChangeScene);
+                    NetworkSceneManager.ServerSceneChanged.AddListener(OnServerSceneChanged);
+                }
             }
         }