Resolve conflicts with #26102

Author: ElectroJr

Content.Server/Spreader/SpreaderSystem.cs

@@ -33,6 +33,8 @@ public sealed class SpreaderSystem : EntitySystem
     // TODO PERFORMANCE Assign each prototype to an index and convert dictionary to array
     private readonly Dictionary<EntityUid, Dictionary<string, int>> _gridUpdates = [];
 
+    private EntityQuery<EdgeSpreaderComponent> _query;
+
     public const float SpreadCooldownSeconds = 1;
 
     [ValidatePrototypeId<TagPrototype>]
@@ -47,6 +49,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<EdgeSpreaderComponent, EntityTerminatingEvent>(OnTerminating);
         SetupPrototypes();
+
+        _query = GetEntityQuery<EdgeSpreaderComponent>();
     }
 
     private void OnPrototypeReload(PrototypesReloadedEventArgs obj)
@@ -66,7 +70,7 @@ private void SetupPrototypes()
 
     private void OnAirtightChanged(ref AirtightChanged ev)
     {
-        ActivateGetSpreadableNeighbors(ev.Entity, ev.Airtight, ev.Position);
+        ActivateSpreadableNeighbors(ev.Entity, ev.Position);
     }
 
     private void OnGridInit(GridInitializeEvent ev)
@@ -76,13 +80,7 @@ private void OnGridInit(GridInitializeEvent ev)
 
     private void OnTerminating(Entity<EdgeSpreaderComponent> entity, ref EntityTerminatingEvent args)
     {
-        var neighbors = GetSpreadableNeighbors(entity);
-
-        foreach (var neighbor in neighbors)
-        {
-            if (!TerminatingOrDeleted(neighbor))
-                EnsureComp<ActiveEdgeSpreaderComponent>(neighbor);
-        }
+        ActivateSpreadableNeighbors(entity);
     }
 
     /// <inheritdoc/>
@@ -248,8 +246,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
             if (!_map.TryGetTileRef(neighborEnt, neighborGrid, neighborPos, out var tileRef) || tileRef.Tile.IsEmpty)
                 continue;
 
-            var directionEnumerator =
-                _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
+            var directionEnumerator = _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
             var occupied = false;
 
             while (directionEnumerator.MoveNext(out var ent))
@@ -271,8 +268,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
                 continue;
 
             var oldCount = occupiedTiles.Count;
-            directionEnumerator =
-                _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
+            directionEnumerator = _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
 
             while (directionEnumerator.MoveNext(out var ent))
             {
@@ -293,13 +289,11 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
     }
 
     /// <summary>
-    /// Given an entity, this returns a list of all adjacent entities with a <see cref="EdgeSpreaderComponent"/>.
+    /// This function activates all spreaders that are adjacent to a given entity. This also activates other spreaders
+    /// on the same tile as the current entity (for thin airtight entities like windoors).
     /// </summary>
-    public void ActivateGetSpreadableNeighbors(EntityUid uid, AirtightComponent? comp = null,
-        (EntityUid Grid, Vector2i Tile)? position = null)
+    public void ActivateSpreadableNeighbors(EntityUid uid, (EntityUid Grid, Vector2i Tile)? position = null)
     {
-        Resolve(uid, ref comp, false);
-
         Vector2i tile;
         EntityUid ent;
         MapGridComponent? grid;
@@ -308,34 +302,39 @@ public void ActivateGetSpreadableNeighbors(EntityUid uid, AirtightComponent? com
         {
             var transform = Transform(uid);
             if (!TryComp(transform.GridUid, out grid) || TerminatingOrDeleted(transform.GridUid.Value))
-                return neighbors;
+                return;
+
             tile = _map.TileIndicesFor(transform.GridUid.Value, grid, transform.Coordinates);
             ent = transform.GridUid.Value;
         }
         else
         {
             if (!TryComp(position.Value.Grid, out grid))
-                return neighbors;
-            tile = position.Value.Tile;
-            ent = position.Value.Grid;
+                return;
+            (ent, tile) = position.Value;
         }
 
-        var spreaderQuery = GetEntityQuery<EdgeSpreaderComponent>();
+        var anchored = _map.GetAnchoredEntitiesEnumerator(ent, grid, tile);
+        while (anchored.MoveNext(out var entity))
+        {
+            if (entity == ent)
+                continue;
+            DebugTools.Assert(Transform(entity.Value).Anchored);
+            if (_query.HasComponent(ent) && !TerminatingOrDeleted(entity.Value))
+                EnsureComp<ActiveEdgeSpreaderComponent>(entity.Value);
+        }
 
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
             var direction = (AtmosDirection) (1 << i);
-            if (comp != null && !comp.AirBlockedDirection.IsFlagSet(direction))
-                continue;
-
-            var directionEnumerator =
-                _map.GetAnchoredEntitiesEnumerator(ent, grid, SharedMapSystem.GetDirection(tile, direction.ToDirection()));
+            var adjacentTile = SharedMapSystem.GetDirection(tile, direction.ToDirection());
+            anchored = _map.GetAnchoredEntitiesEnumerator(ent, grid, adjacentTile);
 
-            while (directionEnumerator.MoveNext(out var entity))
+            while (anchored.MoveNext(out var entity))
             {
                 DebugTools.Assert(Transform(entity.Value).Anchored);
-                if (spreaderQuery.HasComponent(entity) && !TerminatingOrDeleted(entity.Value))
-                    neighbors.Add(entity.Value);
+                if (_query.HasComponent(ent) && !TerminatingOrDeleted(entity.Value))
+                    EnsureComp<ActiveEdgeSpreaderComponent>(entity.Value);
             }
         }
     }