tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert Arch testmerge 2 (#21901)

Browse Source
This commit is contained in:
metalgearsloth
2023-11-26 14:20:07 +11:00
committed by GitHub
parent 855ab4d129
commit 64343c289d
34 changed files with 110 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Administration/Commands/SetOutfitCommand.cs
View File

@@ -34,21 +34,21 @@ namespace Content.Server.Administration.Commands
return;
}
if (!int.TryParse(args[0], out var entInt))
if (!int.TryParse(args[0], out var entityUid))
{
shell.WriteLine(Loc.GetString("shell-entity-uid-must-be-number"));
return;
}
var targetNet = new NetEntity(entInt);
var target = new EntityUid(entityUid);
if (!_entities.TryGetEntity(targetNet, out var target))
if (!target.IsValid() || !_entities.EntityExists(target))
{
shell.WriteLine(Loc.GetString("shell-invalid-entity-id"));
return;
}
if (!_entities.HasComponent<InventoryComponent>(target))
if (!_entities.HasComponent<InventoryComponent?>(target))
{
shell.WriteLine(Loc.GetString("shell-target-entity-does-not-have-message", ("missing", "inventory")));
return;
@@ -63,12 +63,12 @@ namespace Content.Server.Administration.Commands
}
var eui = IoCManager.Resolve<EuiManager>();
var ui = new SetOutfitEui(targetNet);
var ui = new SetOutfitEui(target);
eui.OpenEui(ui, player);
return;
}
if (!SetOutfit(target.Value, args[1], _entities))
if (!SetOutfit(target, args[1], _entities))
shell.WriteLine(Loc.GetString("set-outfit-command-invalid-outfit-id-error"));
}