Skip to content

Commit

Permalink
Fix calls to obsolete EntityCoordinate methods in SharedMapSystem.Grids
Browse files Browse the repository at this point in the history
  • Loading branch information
TemporalOroboros committed Feb 6, 2025
1 parent 392fd38 commit 0a432a4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ public Vector2i TileIndicesFor(EntityUid uid, MapGridComponent grid, EntityCoord
{
#if DEBUG
var mapId = _xformQuery.GetComponent(uid).MapID;
DebugTools.Assert(mapId == coords.GetMapId(EntityManager));
DebugTools.Assert(mapId == _transform.GetMapId(coords));
#endif

return SnapGridLocalCellFor(uid, grid, LocalToGrid(uid, grid, coords));
Expand Down Expand Up @@ -1427,7 +1427,7 @@ public Vector2i CoordinatesToTile(EntityUid uid, MapGridComponent grid, EntityCo
{
#if DEBUG
var mapId = _xformQuery.GetComponent(uid).MapID;
DebugTools.Assert(mapId == coords.GetMapId(EntityManager));
DebugTools.Assert(mapId == _transform.GetMapId(coords));
#endif
var local = LocalToGrid(uid, grid, coords);

Expand All @@ -1449,7 +1449,7 @@ public Vector2 LocalToGrid(EntityUid uid, MapGridComponent grid, EntityCoordinat
{
return position.EntityId == uid
? position.Position
: WorldToLocal(uid, grid, position.ToMapPos(EntityManager, _transform));
: WorldToLocal(uid, grid, _transform.ToMapCoordinates(position).Position);
}

public bool CollidesWithGrid(EntityUid uid, MapGridComponent grid, Vector2i indices)
Expand Down

0 comments on commit 0a432a4

Please sign in to comment.