Fix errors when disposing entities when another client is connected

tatelax · Sep 3, 2021 · 8a5d8b2 · 8a5d8b2
1 parent 844cde3
commit 8a5d8b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Runtime/SimulationController.cs b/Runtime/SimulationController.cs
@@ -78,8 +78,7 @@ protected void Reset()
 		foreach (KeyValuePair<int,IWorld> world in Worlds)
 		{
 			world.Value.Teardown();
-			IDisposable disposableWorld = (IDisposable)world.Value;
-			disposableWorld.Dispose();
+			(world.Value as IDisposable).Dispose();
 		}
 
 		Worlds = new Dictionary<int, IWorld>();

diff --git a/Runtime/World.cs b/Runtime/World.cs
@@ -35,12 +35,12 @@ public void Dispose()
 		{
 			for (int i = 0; i < Groups.Count; i++)
 			{
-				Groups[i].Dispose();
+				Groups[i]?.Dispose();
 			}
 
-			for (int i = 0; i < Entities.Count; i++)
+			foreach (KeyValuePair<int, Entity.Entity> entity in Entities)
 			{
-				Entities[i].Dispose();
+				entity.Value.Dispose();
 			}
 
 			OnEntityCreatedEvent = null;