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

Remove Explicit GridId References (#8315)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2022-06-11 18:54:41 -07:00
committed by GitHub
parent 846321cebb
commit 4f9be42f40
131 changed files with 531 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
View File

@@ -39,9 +39,9 @@ public sealed partial class ExplosionSystem : EntitySystem
//
// We then need this data for every tile on a grid. So this mess of a variable maps the Grid ID and Vector2i grid
// indices to this tile-data struct.
private Dictionary<GridId, Dictionary<Vector2i, TileData>> _airtightMap = new();
private Dictionary<EntityUid, Dictionary<Vector2i, TileData>> _airtightMap = new();
public void UpdateAirtightMap(GridId gridId, Vector2i tile, EntityQuery<AirtightComponent>? query = null)
public void UpdateAirtightMap(EntityUid gridId, Vector2i tile, EntityQuery<AirtightComponent>? query = null)
{
if (_mapManager.TryGetGrid(gridId, out var grid))
UpdateAirtightMap(grid, tile, query);
@@ -62,8 +62,8 @@ public sealed partial class ExplosionSystem : EntitySystem
var tolerance = new float[_explosionTypes.Count];
var blockedDirections = AtmosDirection.Invalid;
if (!_airtightMap.ContainsKey(grid.Index))
_airtightMap[grid.Index] = new();
if (!_airtightMap.ContainsKey(grid.GridEntityId))
_airtightMap[grid.GridEntityId] = new();
query ??= EntityManager.GetEntityQuery<AirtightComponent>();
var damageQuery = EntityManager.GetEntityQuery<DamageableComponent>();
@@ -83,9 +83,9 @@ public sealed partial class ExplosionSystem : EntitySystem
}
if (blockedDirections != AtmosDirection.Invalid)
_airtightMap[grid.Index][tile] = new(tolerance, blockedDirections);
_airtightMap[grid.GridEntityId][tile] = new(tolerance, blockedDirections);
else
_airtightMap[grid.Index].Remove(tile);
_airtightMap[grid.GridEntityId].Remove(tile);
}
/// <summary>
@@ -100,7 +100,7 @@ public sealed partial class ExplosionSystem : EntitySystem
if (!EntityManager.TryGetComponent(uid, out TransformComponent? transform) || !transform.Anchored)
return;
if (!_mapManager.TryGetGrid(transform.GridID, out var grid))
if (!_mapManager.TryGetGrid(transform.GridEntityId, out var grid))
return;
UpdateAirtightMap(grid, grid.CoordinatesToTile(transform.Coordinates));