fix: Bug with NI destroy order (#374)

* failing test * fix for failing test. dont destroy self until end
MirageNet · Oct 2, 2020 · 485f78b · 485f78b
1 parent 49a16dd
commit 485f78b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/Assets/Mirror/Runtime/NetworkConnection.cs b/Assets/Mirror/Runtime/NetworkConnection.cs
@@ -313,12 +313,16 @@ public void DestroyOwnedObjects()
             var tmp = new HashSet<NetworkIdentity>(clientOwnedObjects);
             foreach (NetworkIdentity netIdentity in tmp)
             {
-                if (netIdentity != null)
+                //dont destroy self yet.
+                if (netIdentity != null && netIdentity != Identity)
                 {
                     Identity.Server.Destroy(netIdentity.gameObject);
                 }
             }
 
+            // Destroy the connections own identity.
+            Identity.Server.Destroy(Identity.gameObject);
+
             // clear the hashset because we destroyed them all
             clientOwnedObjects.Clear();
         }

diff --git a/Assets/Tests/Runtime/NetworkIdentityTests.cs b/Assets/Tests/Runtime/NetworkIdentityTests.cs
@@ -215,5 +215,22 @@ public void IdentityServerValueSet()
         {
             Assert.That(identity.Server, Is.Not.Null);
         }
+
+        [UnityTest]
+        public IEnumerator DestroyOwnedObjectsTest() => RunAsync(async () =>
+        {
+            GameObject testObj1 = new GameObject();
+            GameObject testObj2 = new GameObject();
+            GameObject testObj3 = new GameObject();
+
+            server.LocalConnection.AddOwnedObject(testObj1.AddComponent<NetworkIdentity>());
+            server.LocalConnection.AddOwnedObject(testObj2.AddComponent<NetworkIdentity>());
+            server.LocalConnection.AddOwnedObject(testObj3.AddComponent<NetworkIdentity>());
+            server.LocalConnection.DestroyOwnedObjects();
+
+            await WaitFor(() => !testObj1);
+            await WaitFor(() => !testObj2);
+            await WaitFor(() => !testObj3);
+        });
     }
 }