Update arch (#4605)

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
 <Project>
 
-    <!-- This file automatically reset by Tools/version.py -->
+    <!-- This file automatically reset by Tools/version.py -->
 

RELEASE-NOTES.md

@@ -54,6 +54,13 @@ END TEMPLATE-->
 *None yet*
 
 
+## 182.0.0
+
+### Breaking changes
+
+* Add EntityUid's generation / version to the hashcode.
+
+
 ## 181.0.2
 
 ### Bugfixes

Robust.Shared/GameObjects/ArchetypeIterator.cs

@@ -5,30 +5,26 @@ namespace Robust.Shared.GameObjects;
 
 internal struct ArchetypeIterator
 {
-    private readonly Query _query;
     private readonly PooledList<Archetype> _archetypes;
 
-    internal ArchetypeIterator(in Query query, PooledList<Archetype> archetypes)
+    internal ArchetypeIterator(PooledList<Archetype> archetypes)
     {
-        _query = query;
         _archetypes = archetypes;
     }
 
     public ArchetypeEnumerator GetEnumerator()
     {
-        return new ArchetypeEnumerator(_query, _archetypes);
+        return new ArchetypeEnumerator(_archetypes);
     }
 }
 
 internal struct ArchetypeEnumerator
 {
-    private readonly Query _query;
     private readonly PooledList<Archetype> _archetypes;
     private int _index;
 
-    public ArchetypeEnumerator(in Query query, PooledList<Archetype> archetypes)
+    public ArchetypeEnumerator(PooledList<Archetype> archetypes)
     {
-        _query = query;
         _archetypes = archetypes;
         _index = _archetypes.Count;
     }
@@ -38,7 +34,7 @@ internal struct ArchetypeEnumerator
         while (--_index >= 0)
         {
             var archetype = Current;
-            if (archetype.Entities > 0)
+            if (archetype.EntityCount > 0)
             {
                 return true;
             }

Robust.Shared/GameObjects/ChunkIterator.cs

@@ -29,7 +29,7 @@ internal struct ArchChunkEnumerator
 
         if (_archetypes.MoveNext())
         {
-            _chunkIndex = _archetypes.Current.Size;
+            _chunkIndex = _archetypes.Current.ChunkCount;
         }
     }
 
@@ -45,7 +45,7 @@ internal struct ArchChunkEnumerator
             return false;
         }
 
-        _chunkIndex = _archetypes.Current.Size - 1;
+        _chunkIndex = _archetypes.Current.ChunkCount - 1;
         return true;
     }
 }
@@ -54,7 +54,7 @@ internal static partial class QueryExtensions
 {
     internal static ArchChunkIterator ChunkIterator(this in Query query, World world)
     {
-        var archetypeEnumerator = new ArchetypeEnumerator(in query, query.Matches);
+        var archetypeEnumerator = new ArchetypeEnumerator(query.Matches);
         return new ArchChunkIterator(in archetypeEnumerator);
     }
 }

Robust.Shared/GameObjects/EntityUid.cs

@@ -115,7 +115,10 @@ namespace Robust.Shared.GameObjects
         /// <inheritdoc />
         public override int GetHashCode()
         {
-            return Id;
+            unchecked
+            {
+                return Id.GetHashCode() * 397 ^ Version.GetHashCode();
+            }
         }
 
         /// <summary>