Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Nullable grid Uid (#8798)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-20 12:14:35 +12:00
committed by GitHub
parent ef41cd5aa8
commit fa4c6f63f8
82 changed files with 318 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ public sealed class FluidSpreaderSystem : EntitySystem
var prototypeName = metadataOriginal.EntityPrototype!.ID;
var visitedTiles = new HashSet<Vector2i>();
if (!_mapManager.TryGetGrid(transformOrig.GridEntityId, out var mapGrid))
if (!_mapManager.TryGetGrid(transformOrig.GridUid, 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.GetGridEntityId(EntityManager), out var mapGrid)) // needs valid grid
if ((_mapManager.TryGetGrid(clickLocation.GetGridUid(EntityManager), out var mapGrid)) // needs valid grid
&& absorbedSolution is not null) // needs a solution to place on the tile
{
TileRef tile = mapGrid.GetTileRef(clickLocation);

2
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.GetGridEntityId(EntityManager), out var mapGrid))
if (!_mapManager.TryGetGrid(coordinates.GetGridUid(EntityManager), out var mapGrid))
return null; // Let's not spill to space.
return SpillAt(mapGrid.GetTileRef(coordinates), solution, prototype, overflow, sound,

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

@@ -59,7 +59,7 @@ public sealed class SpraySystem : EntitySystem
var playerPos = Transform(args.User).Coordinates;
if (args.ClickLocation.GetGridEntityId(EntityManager) != playerPos.GetGridEntityId(EntityManager))
if (args.ClickLocation.GetGridUid(EntityManager) != playerPos.GetGridUid(EntityManager))
return;
var direction = (args.ClickLocation.Position - playerPos.Position).Normalized;