diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs index 79e5c0a2a9c..67b3ed3f837 100644 --- a/Content.Server/Dragon/DragonSystem.cs +++ b/Content.Server/Dragon/DragonSystem.cs @@ -10,6 +10,7 @@ using Content.Shared.Mind.Components; using Content.Shared.Mobs; using Content.Shared.Movement.Systems; +using Content.Shared.NPC.Systems; using Content.Shared.Zombies; using Robust.Shared.Audio.Systems; using Robust.Shared.Map; diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs index f1c1beef7d1..3e759210481 100644 --- a/Content.Shared/Maps/TurfHelpers.cs +++ b/Content.Shared/Maps/TurfHelpers.cs @@ -28,27 +28,6 @@ public static TileRef GetTileRef(this Vector2i vector2i, EntityUid gridId, IEnti return tile; } - /// - /// Attempts to get the turf at a certain coordinates or null if no such turf is found. - /// - public static TileRef? GetTileRef(this EntityCoordinates coordinates, IEntityManager? entityManager = null, IMapManager? mapManager = null) - { - entityManager ??= IoCManager.Resolve(); - - if (!coordinates.IsValid(entityManager)) - return null; - - mapManager ??= IoCManager.Resolve(); - var pos = coordinates.ToMap(entityManager, entityManager.System()); - if (!mapManager.TryFindGridAt(pos, out _, out var grid)) - return null; - - if (!grid.TryGetTileRef(coordinates, out var tile)) - return null; - - return tile; - } - public static bool TryGetTileRef(this EntityCoordinates coordinates, [NotNullWhen(true)] out TileRef? turf, IEntityManager? entityManager = null, IMapManager? mapManager = null) { return (turf = coordinates.GetTileRef(entityManager, mapManager)) != null;