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

2
Content.Server/Physics/Controllers/ConveyorController.cs
View File

@@ -104,7 +104,7 @@ namespace Content.Server.Physics.Controllers
public IEnumerable<(EntityUid, TransformComponent)> GetEntitiesToMove(ConveyorComponent comp, TransformComponent xform)
{
if (!_mapManager.TryGetGrid(xform.GridID, out var grid) ||
if (!_mapManager.TryGetGrid(xform.GridEntityId, out var grid) ||
!grid.TryGetTileRef(xform.Coordinates, out var tile)) yield break;
var tileAABB = _lookup.GetLocalBounds(tile, grid.TileSize).Enlarged(0.01f);

2
Content.Server/Physics/Controllers/MoverController.cs
View File

@@ -66,7 +66,7 @@ namespace Content.Server.Physics.Controllers
if (pilot.Console == null) continue;
_excludedMobs.Add(mover.Owner);
var gridId = xform.GridID;
var gridId = xform.GridEntityId;
// This tries to see if the grid is a shuttle
if (!_mapManager.TryGetGrid(gridId, out var grid) ||
!EntityManager.TryGetComponent(grid.GridEntityId, out ShuttleComponent? shuttleComponent)) continue;