fix: NRE when destroying all objects (#85)

MirageNet · Mar 20, 2020 · 71e78a7 · 71e78a7
1 parent 750c6ee
commit 71e78a7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Assets/Mirror/Runtime/NetworkClient.cs b/Assets/Mirror/Runtime/NetworkClient.cs
@@ -403,11 +403,11 @@ public void Shutdown()
             if (LogFilter.Debug) Debug.Log("Shutting down client.");
 
             ClearSpawners();
+            DestroyAllClientObjects();
             spawnableObjects = null;
             connection = null;
             ready = false;
             isSpawnFinished = false;
-            DestroyAllClientObjects();
 
             connectState = ConnectState.None;
             handlers.Clear();
@@ -762,7 +762,7 @@ public void ClearSpawners()
         void UnSpawn(NetworkIdentity identity)
         {
             Guid assetId = identity.assetId;
-
+            
             identity.OnNetworkDestroy();
             if (unspawnHandlers.TryGetValue(assetId, out UnSpawnDelegate handler) && handler != null)
             {