From 3f014e84ebf3dd860ec3595ad59f580fcff3b852 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Thu, 18 Jul 2024 02:41:15 +0200
Subject: [PATCH] minor SharedInteractionSystem cleanup (#30139)

cleanup SharedInteractionSystem
---
 Content.Shared/Interaction/SharedInteractionSystem.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 48076ca360fffd..c32b4bcf780924 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -38,8 +38,6 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-#pragma warning disable 618
-
 namespace Content.Shared.Interaction
 {
     /// <summary>
@@ -522,11 +520,11 @@ public void InteractUsingRanged(EntityUid user, EntityUid used, EntityUid? targe
         protected bool ValidateInteractAndFace(EntityUid user, EntityCoordinates coordinates)
         {
             // Verify user is on the same map as the entity they clicked on
-            if (coordinates.GetMapId(EntityManager) != Transform(user).MapID)
+            if (_transform.GetMapId(coordinates) != Transform(user).MapID)
                 return false;
 
             if (!HasComp<NoRotateOnInteractComponent>(user))
-                _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager, _transform));
+                _rotateToFaceSystem.TryFaceCoordinates(user, _transform.ToMapCoordinates(coordinates).Position);
 
             return true;
         }
@@ -859,7 +857,7 @@ public bool InRangeUnobstructed(
             Ignored? predicate = null,
             bool popup = false)
         {
-            return InRangeUnobstructed(origin, other.ToMap(EntityManager, _transform), range, collisionMask, predicate, popup);
+            return InRangeUnobstructed(origin, _transform.ToMapCoordinates(other), range, collisionMask, predicate, popup);
         }
 
         /// <summary>
@@ -966,7 +964,7 @@ public void InteractUsing(
         /// </summary>
         public void InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach)
         {
-            if (target is {Valid: false})
+            if (target is { Valid: false })
                 target = null;
 
             var afterInteractEvent = new AfterInteractEvent(user, used, target, clickLocation, canReach);