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

4
Content.Server/Fluids/EntitySystems/FluidSpreaderSystem.cs
View File

@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Fluids.Components;
@@ -103,7 +103,7 @@ public sealed class FluidSpreaderSystem : EntitySystem
var prototypeName = metadataOriginal.EntityPrototype!.ID;
var visitedTiles = new HashSet<Vector2i>();
if (!_mapManager.TryGetGrid(transformOrig.GridID, out var mapGrid))
if (!_mapManager.TryGetGrid(transformOrig.GridEntityId, out var mapGrid))
return;
// skip origin puddle

2
Content.Server/Fluids/EntitySystems/MoppingSystem.cs
View File

@@ -76,7 +76,7 @@ public sealed class MoppingSystem : EntitySystem
private void ReleaseToFloor(EntityCoordinates clickLocation, AbsorbentComponent absorbent, Solution? absorbedSolution)
{
if ((_mapManager.TryGetGrid(clickLocation.GetGridId(EntityManager), out var mapGrid)) // needs valid grid
if ((_mapManager.TryGetGrid(clickLocation.GetGridEntityId(EntityManager), out var mapGrid)) // needs valid grid
&& absorbedSolution is not null) // needs a solution to place on the tile
{
TileRef tile = mapGrid.GetTileRef(clickLocation);

4
Content.Server/Fluids/EntitySystems/SpillableSystem.cs
View File

@@ -132,7 +132,7 @@ public sealed class SpillableSystem : EntitySystem
if (solution.TotalVolume == 0) return null;
if (!_mapManager.TryGetGrid(coordinates.GetGridId(EntityManager), out var mapGrid))
if (!_mapManager.TryGetGrid(coordinates.GetGridEntityId(EntityManager), out var mapGrid))
return null; // Let's not spill to space.
return SpillAt(mapGrid.GetTileRef(coordinates), solution, prototype, overflow, sound,
@@ -162,7 +162,7 @@ public sealed class SpillableSystem : EntitySystem
// If space return early, let that spill go out into the void
if (tileRef.Tile.IsEmpty) return null;
var gridId = tileRef.GridIndex;
var gridId = tileRef.GridUid;
if (!_mapManager.TryGetGrid(gridId, out var mapGrid)) return null; // Let's not spill to invalid grids.
if (!noTileReact)

5
Content.Server/Fluids/EntitySystems/SpraySystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Chemistry.Components;
using Content.Server.Chemistry.Components;
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Cooldown;
using Content.Server.Extinguisher;
@@ -10,6 +10,7 @@ using Content.Shared.FixedPoint;
using Content.Shared.Interaction;
using Content.Shared.Vapor;
using Robust.Shared.Audio;
using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Timing;
@@ -58,7 +59,7 @@ public sealed class SpraySystem : EntitySystem
var playerPos = Transform(args.User).Coordinates;
if (args.ClickLocation.GetGridId(EntityManager) != playerPos.GetGridId(EntityManager))
if (args.ClickLocation.GetGridEntityId(EntityManager) != playerPos.GetGridEntityId(EntityManager))
return;
var direction = (args.ClickLocation.Position - playerPos.Position).Normalized;