BUI range check changes (#3099)

Robust.Server/GameObjects/EntitySystems/UserInterfaceSystem.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -7,7 +7,6 @@ using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Server.GameObjects
@@ -15,8 +14,7 @@ namespace Robust.Server.GameObjects
     [UsedImplicitly]
     public sealed class UserInterfaceSystem : SharedUserInterfaceSystem
     {
-        private const float MaxWindowRange = 2;
-        private const float MaxWindowRangeSquared = MaxWindowRange * MaxWindowRange;
+        [Dependency] private readonly TransformSystem _xformSys = default!;
 
         private readonly List<IPlayerSession> _sessionCache = new();
 
@@ -101,9 +99,10 @@ namespace Robust.Server.GameObjects
         /// <inheritdoc />
         public override void Update(float frameTime)
         {
+            var query = GetEntityQuery<TransformComponent>();
             foreach (var userInterface in _activeInterfaces.ToList())
             {
-                CheckRange(userInterface);
+                CheckRange(userInterface, query);
                 userInterface.DispatchPendingState();
             }
         }
@@ -111,35 +110,35 @@ namespace Robust.Server.GameObjects
         /// <summary>
         ///     Verify that the subscribed clients are still in range of the interface.
         /// </summary>
-        private void CheckRange(BoundUserInterface ui)
+        private void CheckRange(BoundUserInterface ui, EntityQuery<TransformComponent> query)
         {
+            if (ui.InteractionRangeSqrd <= 0)
+                return;
+
             // We have to cache the set of sessions because Unsubscribe modifies the original.
             _sessionCache.Clear();
             _sessionCache.AddRange(ui.SubscribedSessions);
 
-            var transform = EntityManager.GetComponent<TransformComponent>(ui.Owner.Owner);
-
-            var uiPos = transform.WorldPosition;
+            var transform = query.GetComponent(ui.Owner.Owner);
+            var uiPos = _xformSys.GetWorldPosition(transform, query);
             var uiMap = transform.MapID;
 
             foreach (var session in _sessionCache)
             {
-                var attachedEntityTransform = session.AttachedEntityTransform;
-
                 // The component manages the set of sessions, so this invalid session should be removed soon.
-                if (attachedEntityTransform == null)
+                if (!query.TryGetComponent(session.AttachedEntity, out var xform))
                 {
                     continue;
                 }
 
-                if (uiMap != attachedEntityTransform.MapID)
+                if (uiMap != xform.MapID)
                 {
                     ui.Close(session);
                     continue;
                 }
 
-                var distanceSquared = (uiPos - attachedEntityTransform.WorldPosition).LengthSquared;
-                if (distanceSquared > MaxWindowRangeSquared)
+                var distanceSquared = (uiPos - _xformSys.GetWorldPosition(xform, query)).LengthSquared;
+                if (distanceSquared > ui.InteractionRangeSqrd)
                 {
                     ui.Close(session);
                 }