Fixed #177

genaray · Nov 24, 2023 · a207c15 · a207c15
1 parent e147287
commit a207c15
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/Arch/Arch.csproj b/src/Arch/Arch.csproj
@@ -38,7 +38,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DefineConstants>TRACE;</DefineConstants>
+    <DefineConstants>TRACE;EVENTS;</DefineConstants>
     <Optimize>false</Optimize>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
@@ -93,7 +93,7 @@
     <PackageReference Include="Collections.Pooled" Version="2.0.0-preview.27" />
     <PackageReference Include="CommunityToolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageReference Include="ZeroAllocJobScheduler" Version="1.0.2" />
+    <PackageReference Include="ZeroAllocJobScheduler" Version="1.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Arch/Core/Edges/Archetype.Edges.cs b/src/Arch/Core/Edges/Archetype.Edges.cs
@@ -139,9 +139,16 @@ internal void RemoveEdge(Archetype archetype)
             for (var itemIndex = 0; itemIndex < bucket.Capacity; itemIndex++)
             {
                 var edge = bucket[itemIndex];
-                if (edge == archetype)
+                if (edge != archetype)
                 {
-                    RemoveAddEdge(index);
+                    continue;
+                }
+
+                // Remove from bucket and if the removal caused it being trimmed, break the search and continue with the next
+                RemoveAddEdge((index * BucketSize) + itemIndex);
+                if (bucket.IsEmpty)
+                {
+                    break;
                 }
             }
         }
@@ -159,9 +166,16 @@ internal void RemoveEdge(Archetype archetype)
             for (var itemIndex = 0; itemIndex < bucket.Capacity; itemIndex++)
             {
                 var edge = bucket[itemIndex];
-                if (edge == archetype)
+                if (edge != archetype)
+                {
+                    continue;
+                }
+
+                // Remove from bucket and if the removal caused it being trimmed, break the search and continue with the next
+                RemoveRemoveEdge((index * BucketSize) + itemIndex);
+                if (bucket.IsEmpty)
                 {
-                    RemoveRemoveEdge(index);
+                    break;
                 }
             }
         }