fix: #3122 DestroyAllClientObjects now also resets after unspawn hand…

…ler was called (#3124)
MirrorNetworking · Mar 23, 2022 · 3d6c41a · 3d6c41a
1 parent cca7afd
commit 3d6c41a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Assets/Mirror/Runtime/NetworkClient.cs b/Assets/Mirror/Runtime/NetworkClient.cs
@@ -1433,7 +1433,14 @@ public static void DestroyAllClientObjects()
                         identity.OnStopClient();
 
                         bool wasUnspawned = InvokeUnSpawnHandler(identity.assetId, identity.gameObject);
-                        if (!wasUnspawned)
+
+                        // unspawned objects should be reset for reuse later.
+                        if (wasUnspawned)
+                        {
+                            identity.Reset();
+                        }
+                        // without unspawn handler, we need to disable/destroy.
+                        else
                         {
                             // scene objects are reset and disabled.
                             // they always stay in the scene, we don't destroy them.