fix: ClientSceneManager should be responsible for its own cleanup (#298)

MirageNet · Jul 17, 2020 · 92ab3ff · 92ab3ff
1 parent f44f3c9
commit 92ab3ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Assets/Mirror/Runtime/NetworkClient.cs b/Assets/Mirror/Runtime/NetworkClient.cs
@@ -312,7 +312,6 @@ void Cleanup()
 
             ClearSpawners();
             DestroyAllClientObjects();
-            sceneManager.Ready = false;
             isSpawnFinished = false;
             hostServer = null;
 

diff --git a/Assets/Mirror/Runtime/NetworkSceneManager.cs b/Assets/Mirror/Runtime/NetworkSceneManager.cs
@@ -74,6 +74,7 @@ public void Start()
             if (client != null)
             {
                 client.Authenticated.AddListener(OnClientAuthenticated);
+                client.Disconnected.AddListener(OnClientDisconnected);
             }
             if (server != null)
             {
@@ -214,6 +215,13 @@ void OnClientAuthenticated(INetworkConnection conn)
             logger.Log("NetworkSceneManager.OnClientAuthenticated");
         }
 
+        void OnClientDisconnected()
+        {
+            Ready = false;
+            client.Authenticated.RemoveListener(OnClientAuthenticated);
+            client.Disconnected.RemoveListener(OnClientDisconnected);
+        }
+
         internal void ClientSceneMessage(INetworkConnection conn, SceneMessage msg)
         {
             if (!client.IsConnected)