Fix dock highlighting (#24369)

Nentity casualty

diff --git a/Content.Client/Shuttles/UI/RadarControl.cs b/Content.Client/Shuttles/UI/RadarControl.cs
index eaf73b18ee810f50be22f901dea0140d1607c1a4..45e6da22f42af15935b60dac5f2a230e24fa61a9 100644 (file)
--- a/Content.Client/Shuttles/UI/RadarControl.cs
+++ b/Content.Client/Shuttles/UI/RadarControl.cs
@@ -47,7 +47,7 @@ public sealed class RadarControl : MapGridControl
     /// <summary>
     /// Currently hovered docked to show on the map.
     /// </summary>
-    public EntityUid? HighlightedDock;
+    public NetEntity? HighlightedDock;
 
     /// <summary>
     /// Raised if the user left-clicks on the radar control with the relevant entitycoordinates.
@@ -325,14 +325,13 @@ public sealed class RadarControl : MapGridControl
         {
             foreach (var state in docks)
             {
-                var ent = _entManager.GetEntity(state.Entity);
                 var position = state.Coordinates.Position;
                 var uiPosition = matrix.Transform(position);
 
                 if (uiPosition.Length() > WorldRange - DockScale)
                     continue;
 
-                var color = HighlightedDock == ent ? state.HighlightedColor : state.Color;
+                var color = HighlightedDock == state.Entity ? state.HighlightedColor : state.Color;
 
                 uiPosition.Y = -uiPosition.Y;
 

diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
index 828b98868fc6632d3fb473a0835b15a80c3cbf40..d67227549a9071e5244be20ccf15ea81a9f372c4 100644 (file)
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
@@ -234,7 +234,7 @@ public sealed partial class ShuttleConsoleWindow : FancyWindow,
 
     private void OnDockMouseEntered(GUIMouseHoverEventArgs obj, DockingInterfaceState state)
     {
-        RadarScreen.HighlightedDock = _entManager.GetEntity(state.Entity);
+        RadarScreen.HighlightedDock = state.Entity;
     }
 
     private void OnDockMouseExited(GUIMouseHoverEventArgs obj, DockingInterfaceState state)