Makes InRangeUnobstructed use MapCoordinates. Fixes #1003

(Also updates Submoduke)

Content.Client/State/GameScreenBase.cs

@@ -58,7 +58,7 @@ namespace Content.Client.State
             if (_playerManager.LocalPlayer.ControlledEntity != null && entityToClick != null)
             {
                 var playerPos = _playerManager.LocalPlayer.ControlledEntity.Transform.MapPosition;
-                var entityPos = entityToClick.Transform.WorldPosition;
+                var entityPos = entityToClick.Transform.MapPosition;
                 inRange = _entitySystemManager.GetEntitySystem<SharedInteractionSystem>()
                     .InRangeUnobstructed(playerPos, entityPos, predicate:entity => entity != _playerManager.LocalPlayer.ControlledEntity || entity != entityToClick);
             }

Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs

@@ -50,7 +50,7 @@ namespace Content.Server.GameObjects.Components.Construction
         {
             var prototype = _prototypeManager.Index<ConstructionPrototype>(prototypeName);
 
-            if (!InteractionChecks.InRangeUnobstructed(Owner, loc.ToMapPos(_mapManager),
+            if (!InteractionChecks.InRangeUnobstructed(Owner, loc.ToMap(_mapManager),
                 ignoredEnt: Owner, insideBlockerValid: prototype.CanBuildInImpassable))
             {
                 return;

Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs

@@ -47,7 +47,7 @@ namespace Content.Server.GameObjects.Components.Interactable
 
             var coordinates = mapGrid.GridTileToLocal(tile.GridIndices);
 
-            if (!_entitySystemManager.GetEntitySystem<InteractionSystem>().InRangeUnobstructed(user.Transform.MapPosition, coordinates.ToMapPos(_mapManager), ignoredEnt:user))
+            if (!_entitySystemManager.GetEntitySystem<InteractionSystem>().InRangeUnobstructed(user.Transform.MapPosition, coordinates.ToMap(_mapManager), ignoredEnt:user))
                 return;
 
             var tileDef = (ContentTileDefinition)_tileDefinitionManager[tile.Tile.TypeId];

Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs

@@ -97,7 +97,7 @@ namespace Content.Server.GameObjects
                 return false;
 
             var userPos = user.Transform.MapPosition;
-            var itemPos = Owner.Transform.WorldPosition;
+            var itemPos = Owner.Transform.MapPosition;
 
             return InteractionChecks.InRangeUnobstructed(user, itemPos, ignoredEnt: Owner, insideBlockerValid:true);
         }

Content.Server/GameObjects/Components/WiresComponent.cs

@@ -239,7 +239,7 @@ namespace Content.Server.GameObjects.Components
                         return;
                     }
 
-                    if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(player.Transform.MapPosition, Owner.Transform.WorldPosition, ignoredEnt: Owner))
+                    if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(player.Transform.MapPosition, Owner.Transform.MapPosition, ignoredEnt: Owner))
                     {
                         _notifyManager.PopupMessage(Owner.Transform.GridPosition, player, _localizationManager.GetString("You can't reach there!"));
                         return;

Content.Server/GameObjects/EntitySystems/HandsSystem.cs

@@ -122,7 +122,7 @@ namespace Content.Server.GameObjects.EntitySystems
                 return false;
 
 
-            if(EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(coords.ToMap(_mapManager), ent.Transform.WorldPosition, ignoredEnt: ent))
+            if(EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(coords.ToMap(_mapManager), ent.Transform.MapPosition, ignoredEnt: ent))
                 if (coords.InRange(_mapManager, ent.Transform.GridPosition, InteractionSystem.InteractionRange))
                 {
                     handsComp.Drop(handsComp.ActiveIndex, coords);

Content.Server/Utility/InteractionChecks.cs

@@ -28,7 +28,7 @@ namespace Content.Server.Utility
         public static bool InRangeUnobstructed(ITargetedInteractEventArgs eventArgs, bool insideBlockerValid = true)
         {
             if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(eventArgs.User.Transform.MapPosition,
-                eventArgs.Target.Transform.WorldPosition, ignoredEnt: eventArgs.Target, insideBlockerValid: insideBlockerValid))
+                eventArgs.Target.Transform.MapPosition, ignoredEnt: eventArgs.Target, insideBlockerValid: insideBlockerValid))
             {
                 var localizationManager = IoCManager.Resolve<ILocalizationManager>();
                 eventArgs.Target.PopupMessage(eventArgs.User, localizationManager.GetString("You can't reach there!"));
@@ -50,7 +50,7 @@ namespace Content.Server.Utility
             if (eventArgs.Target != null)
             {
                 if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(eventArgs.User.Transform.MapPosition,
-                    eventArgs.Target.Transform.WorldPosition, ignoredEnt: eventArgs.Target, insideBlockerValid: insideBlockerValid))
+                    eventArgs.Target.Transform.MapPosition, ignoredEnt: eventArgs.Target, insideBlockerValid: insideBlockerValid))
                 {
                     var localizationManager = IoCManager.Resolve<ILocalizationManager>();
                     eventArgs.Target.PopupMessage(eventArgs.User, localizationManager.GetString("You can't reach there!"));
@@ -59,9 +59,8 @@ namespace Content.Server.Utility
             }
             else
             {
-                var mapManager = IoCManager.Resolve<IMapManager>();
                 if (!EntitySystem.Get<SharedInteractionSystem>().InRangeUnobstructed(eventArgs.User.Transform.MapPosition,
-                    eventArgs.ClickLocation.ToMapPos(mapManager), ignoredEnt: eventArgs.User, insideBlockerValid: insideBlockerValid))
+                    eventArgs.ClickLocation.ToMap(IoCManager.Resolve<IMapManager>()), ignoredEnt: eventArgs.User, insideBlockerValid: insideBlockerValid))
                 {
                     var localizationManager = IoCManager.Resolve<ILocalizationManager>();
                     eventArgs.User.PopupMessage(eventArgs.User, localizationManager.GetString("You can't reach there!"));
@@ -77,13 +76,14 @@ namespace Content.Server.Utility
         /// Convenient static alternative to <see cref="SharedInteractionSystem.InRangeUnobstructed"/>, which also
         /// shows a popup message if not in range.
         /// </summary>
-        public static bool InRangeUnobstructed(IEntity user, Vector2 targetWorldCoords,
+        public static bool InRangeUnobstructed(IEntity user, MapCoordinates otherCoords,
             float range = SharedInteractionSystem.InteractionRange,
             int collisionMask = (int) CollisionGroup.Impassable, IEntity ignoredEnt = null,
             bool insideBlockerValid = false)
         {
+            var mapManager = IoCManager.Resolve<IMapManager>();
             var interactionSystem = EntitySystem.Get<SharedInteractionSystem>();
-            if (!interactionSystem.InRangeUnobstructed(user.Transform.MapPosition, targetWorldCoords, range, collisionMask,
+            if (!interactionSystem.InRangeUnobstructed(user.Transform.MapPosition, otherCoords, range, collisionMask,
                 ignoredEnt, insideBlockerValid))
             {
                 var localizationManager = IoCManager.Resolve<ILocalizationManager>();

Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs

@@ -31,7 +31,7 @@ namespace Content.Shared.GameObjects.EntitySystems
             }
 
             return EntitySystem.Get<SharedInteractionSystem>()
-                .InRangeUnobstructed(examiner.Transform.MapPosition, examined.Transform.MapPosition.Position,
+                .InRangeUnobstructed(examiner.Transform.MapPosition, examined.Transform.MapPosition,
                     ExamineRange, predicate: entity => entity == examiner || entity == examined, insideBlockerValid:true);
         }
     }

Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs

@@ -39,31 +39,20 @@ namespace Content.Server.GameObjects.EntitySystems
         /// <param name="predicate">.</param>
         /// <param name="insideBlockerValid">if coordinates inside obstructions count as obstructed or not</param>
         /// <returns>True if the two points are within a given range without being obstructed.</returns>
-        public bool InRangeUnobstructed(MapCoordinates coords, Vector2 otherCoords, float range = InteractionRange,
+        public bool InRangeUnobstructed(MapCoordinates coords, MapCoordinates otherCoords, float range = InteractionRange,
             int collisionMask = (int)CollisionGroup.Impassable, Func<IEntity, bool> predicate = null, bool insideBlockerValid = false)
         {
-            var dir = otherCoords - coords.Position;
+            if (!coords.InRange(otherCoords, range))
+                return false;
+
+            var dir = otherCoords.Position - coords.Position;
 
             if (dir.LengthSquared.Equals(0f)) return true;
             if (range > 0f && !(dir.LengthSquared <= range * range)) return false;
 
             var ray = new CollisionRay(coords.Position, dir.Normalized, collisionMask);
             var rayResults = _physicsManager.IntersectRayWithPredicate(coords.MapId, ray, dir.Length, predicate).ToList();
-            if(rayResults.Count == 0 || (insideBlockerValid && rayResults.Count > 0 && (rayResults[0].HitPos - otherCoords).Length < 1f))
+            return rayResults.Count == 0 || (insideBlockerValid && rayResults.Count > 0 && (rayResults[0].HitPos - otherCoords.Position).Length < 1f);
-            {
-
-                if (_mapManager.TryFindGridAt(coords, out var mapGrid) && mapGrid != null)
-                {
-                    var srcPos = mapGrid.MapToGrid(coords);
-                    var destPos = new GridCoordinates(otherCoords, mapGrid);
-                    if (srcPos.InRange(_mapManager, destPos, range))
-                    {
-                        return true;
-                    }
-                }
-
-            }
-            return false;
         }
 
         /// <summary>
@@ -79,7 +68,7 @@ namespace Content.Server.GameObjects.EntitySystems
         /// <param name="ignoredEnt">the entity to be ignored when checking for collisions.</param>
         /// <param name="insideBlockerValid">if coordinates inside obstructions count as obstructed or not</param>
         /// <returns>True if the two points are within a given range without being obstructed.</returns>
-        public bool InRangeUnobstructed(MapCoordinates coords, Vector2 otherCoords, float range = InteractionRange,
+        public bool InRangeUnobstructed(MapCoordinates coords, MapCoordinates otherCoords, float range = InteractionRange,
             int collisionMask = (int)CollisionGroup.Impassable, IEntity ignoredEnt = null, bool insideBlockerValid = false) =>
             InRangeUnobstructed(coords, otherCoords, range, collisionMask,
                 ignoredEnt == null ? null : (Func<IEntity, bool>)(entity => ignoredEnt == entity), insideBlockerValid);