Fix misc bugs (#15314)

2023-04-12 12:18:30 +12:00
parent d068c4f36b
commit 21378f6e41
9 changed files with 31 additions and 19 deletions
--- a/Content.Shared/Maps/TurfHelpers.cs
+++ b/Content.Shared/Maps/TurfHelpers.cs
@@ -37,13 +37,11 @@ namespace Content.Shared.Maps
            if (!coordinates.IsValid(entityManager))
                return null;

-
            mapManager ??= IoCManager.Resolve<IMapManager>();
-
-            if (!mapManager.TryGetGrid(coordinates.GetGridUid(entityManager), out var grid))
+            var pos = coordinates.ToMap(entityManager, entityManager.System<SharedTransformSystem>());
+            if (!mapManager.TryFindGridAt(pos, out var grid))
                return null;

-
            if (!grid.TryGetTileRef(coordinates, out var tile))
                return null;