Fix misc commands (#20004)

diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs
index 7987d464d7479dd76a57a2c9a3576f19bc112c9b..1d41eb2fdecaec791106b959b9f6b1c1167f1c91 100644 (file)
--- a/Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs
+++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs
@@ -37,7 +37,7 @@ namespace Content.Client.Administration.UI.SetOutfit
         public override void HandleState(EuiStateBase state)
         {
             var outfitState = (SetOutfitEuiState) state;
-            _window.TargetEntityId = _entManager.GetEntity(outfitState.TargetNetEntity);
+            _window.TargetEntityId = outfitState.TargetNetEntity;
 
         }
     }

diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
index 473d706badc3bc9f7c7df629fe3a833d68125c4e..a2faf208d92f7fddbac230d15ff374c5de8da2de 100644 (file)
--- a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
+++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
@@ -18,7 +18,7 @@ namespace Content.Client.Administration.UI.SetOutfit
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
 
-        public EntityUid? TargetEntityId { get; set; }
+        public NetEntity? TargetEntityId { get; set; }
         private StartingGearPrototype? _selectedOutfit;
 
         public SetOutfitMenu()

diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
index 770a244a19ced19ba7d30ef6f68a5dd469909bad..34611f51aff209833965eff37115d76002340885 100644 (file)
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
@@ -104,7 +104,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
         private void OnTeleportButtonPressed(BaseButton.ButtonEventArgs obj)
         {
             IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
-                $"tp {XCoordinate.Value} {YCoordinate.Value} {new NetEntity(MapOptions.SelectedId)}");
+                $"tp {XCoordinate.Value} {YCoordinate.Value} {new MapId(MapOptions.SelectedId)}");
         }
 
         private void OnSubmitButtonPressed(BaseButton.ButtonEventArgs obj)
@@ -112,7 +112,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
             if (MapPath.Text.Length == 0) return;
 
             IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
-                $"loadbp {new NetEntity(MapOptions.SelectedId)} \"{MapPath.Text}\" {XCoordinate.Value} {YCoordinate.Value} {RotationSpin.Value}");
+                $"loadbp {new MapId(MapOptions.SelectedId)} \"{MapPath.Text}\" {XCoordinate.Value} {YCoordinate.Value} {RotationSpin.Value}");
         }
     }
 }

diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
index 87db34fbece757028e7316997e3691233415569f..d273ea3e55af9ca7fa206bb3f963daa23f202743 100644 (file)
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
@@ -15,7 +15,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
     [UsedImplicitly]
     public sealed partial class AddGasWindow : DefaultWindow
     {
-        private List<EntityUid>? _gridData;
+        private List<NetEntity>? _gridData;
         private IEnumerable<GasPrototype>? _gasData;
 
         protected override void EnteredTree()
@@ -25,11 +25,12 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
             var playerManager = IoCManager.Resolve<IPlayerManager>();
 
             var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>();
-            _gridData ??= new List<EntityUid>();
+            _gridData ??= new List<NetEntity>();
             _gridData.Clear();
 
             while (gridQuery.MoveNext(out var uid, out _))
             {
+                _gridData.Add(entManager.GetNetEntity(uid));
                 var player = playerManager.LocalPlayer?.ControlledEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
@@ -60,7 +61,6 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
 
             var gasList = _gasData.ToList();
             var gasId = gasList[GasOptions.SelectedId].ID;
-
             IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
                 $"addgas {TileXSpin.Value} {TileYSpin.Value} {gridIndex} {gasId} {AmountSpin.Value}");
         }

diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
index 5e17d3d0313930d9b5886bacdcc2155eb4d27350..276ec3d67dfe25ec7406065c42d2d5214068a101 100644 (file)
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
@@ -19,7 +19,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
     [UsedImplicitly]
     public sealed partial class FillGasWindow : DefaultWindow
     {
-        private List<EntityUid>? _gridData;
+        private List<NetEntity>? _gridData;
         private IEnumerable<GasPrototype>? _gasData;
 
         protected override void EnteredTree()
@@ -29,7 +29,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
             var playerManager = IoCManager.Resolve<IPlayerManager>();
 
             var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>();
-            _gridData ??= new List<EntityUid>();
+            _gridData ??= new List<NetEntity>();
             _gridData.Clear();
 
             while (gridQuery.MoveNext(out var uid, out _))
@@ -37,7 +37,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
                 var player = playerManager.LocalPlayer?.ControlledEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
-                _gridData.Add(uid);
+                _gridData.Add(entManager.GetNetEntity(uid));
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);

diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
index ca0efbbc7c5534cde18af31c0da4bdd79d9b6715..850e43e4188e7fd80806e07b26ad5d0a2763a47b 100644 (file)
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
@@ -17,7 +17,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
     [UsedImplicitly]
     public sealed partial class SetTemperatureWindow : DefaultWindow
     {
-        private List<EntityUid>? _data;
+        private List<NetEntity>? _data;
 
         protected override void EnteredTree()
         {
@@ -25,7 +25,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
             var playerManager = IoCManager.Resolve<IPlayerManager>();
 
             var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>();
-            _data ??= new List<EntityUid>();
+            _data ??= new List<NetEntity>();
             _data.Clear();
 
             while (gridQuery.MoveNext(out var uid, out _))
@@ -33,7 +33,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
                 var player = playerManager.LocalPlayer?.ControlledEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
-                _data.Add(uid);
+                _data.Add(entManager.GetNetEntity(uid));
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);
@@ -47,7 +47,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
 
             var selectedGrid = _data[GridOptions.SelectedId];
             IoCManager.Resolve<IClientConsoleHost>()
-                .ExecuteCommand($"settemp {TileXSpin.Value} {TileYSpin.Value} {IoCManager.Resolve<IEntityManager>().GetNetEntity(selectedGrid)} {TemperatureSpin.Value}");
+                .ExecuteCommand($"settemp {TileXSpin.Value} {TileYSpin.Value} {selectedGrid} {TemperatureSpin.Value}");
         }
     }
 }