tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nuke gridtilelookup (#6030)

Browse Source
This commit is contained in:
metalgearsloth
2022-01-09 23:47:01 +11:00
committed by GitHub
parent e648ad72b9
commit 64de4bbed9
8 changed files with 22 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs
View File

@@ -136,8 +136,10 @@ namespace Content.Server.Chemistry.Components
return;
var chemistry = EntitySystem.Get<ReactiveSystem>();
var mapGrid = MapManager.GetGrid(_entities.GetComponent<TransformComponent>(Owner).GridID);
var tile = mapGrid.GetTileRef(_entities.GetComponent<TransformComponent>(Owner).Coordinates.ToVector2i(_entities, MapManager));
var xform = _entities.GetComponent<TransformComponent>(Owner);
var mapGrid = MapManager.GetGrid(xform.GridID);
var tile = mapGrid.GetTileRef(xform.Coordinates.ToVector2i(_entities, MapManager));
var lookup = IoCManager.Resolve<IEntityLookup>();
var solutionFraction = 1 / Math.Floor(averageExposures);
@@ -155,14 +157,14 @@ namespace Content.Server.Chemistry.Components
}
// Touch every entity on the tile
foreach (var entity in tile.GetEntitiesInTileFast().ToArray())
foreach (var entity in lookup.GetEntitiesIntersecting(tile).ToArray())
{
chemistry.ReactionEntity(entity, ReactionMethod.Touch, reagent,
reagentQuantity.Quantity * solutionFraction, solution);
}
}
foreach (var entity in tile.GetEntitiesInTileFast().ToArray())
foreach (var entity in lookup.GetEntitiesIntersecting(tile).ToArray())
{
ReactWithEntity(entity, solutionFraction);
}