diff --git a/Robust.Client/Placement/PlacementManager.cs b/Robust.Client/Placement/PlacementManager.cs index 04e412c1c0..f48ccda658 100644 --- a/Robust.Client/Placement/PlacementManager.cs +++ b/Robust.Client/Placement/PlacementManager.cs @@ -536,13 +536,14 @@ namespace Robust.Client.Placement } else { + var mousePosition = EyeManager.PixelToMap(InputManager.MouseScreenPosition); var map = EntityManager.GetComponent(ent).MapID; - if (map == MapId.Nullspace || !Eraser) + if (map == MapId.Nullspace || !Eraser || mousePosition.MapId == MapId.Nullspace) { coordinates = new EntityCoordinates(); return false; } - coordinates = XformSystem.ToCoordinates(ent, EyeManager.PixelToMap(InputManager.MouseScreenPosition)); + coordinates = XformSystem.ToCoordinates(mousePosition); return true; } }