Solves #181

genaray · Feb 15, 2024 · b4823e7 · b4823e7
1 parent 92a6b86
commit b4823e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Arch.Tests/WorldTest.cs b/src/Arch.Tests/WorldTest.cs
@@ -278,6 +278,10 @@ public void TrimExcess()
         That(world.Capacity, Is.EqualTo(archetype.EntitiesPerChunk));
         That(archetype.ChunkCount, Is.EqualTo(1));
         That(archetype.ChunkCapacity, Is.EqualTo(1));
+
+        // Recycled ids must be trimmed too so that the newest created entity is not out of bounds!
+        world.RecycledIds.TryPeek(out var entityId);
+        That(entityId.Id, Is.EqualTo(world.Capacity - 1));
     }
 
     /// <summary>

diff --git a/src/Arch/Core/World.cs b/src/Arch/Core/World.cs
@@ -411,6 +411,10 @@ public void TrimExcess()
             archetype.TrimExcess();
             Capacity += archetype.ChunkCount * archetype.EntitiesPerChunk; // Since always one chunk always exists.
         }
+
+        // Traverse recycled ids and remove all that are higher than the current capacity.
+        // If we do not do this, a new entity might get a id higher than the entityinfo array which causes it to go out of bounds.
+        RecycledIds.RemoveWhere(entity => entity.Id >= Capacity);
     }
 
     /// <summary>