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

17
Content.Server/Verbs/Commands/ListVerbsCommand.cs
View File

@@ -8,8 +8,6 @@ namespace Content.Server.Verbs.Commands
[AdminCommand(AdminFlags.Admin)]
public sealed class ListVerbsCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "listverbs";
public string Description => Loc.GetString("list-verbs-command-description");
public string Help => Loc.GetString("list-verbs-command-help");
@@ -22,11 +20,11 @@ namespace Content.Server.Verbs.Commands
return;
}
var verbSystem = _entManager.System<SharedVerbSystem>();
var entityManager = IoCManager.Resolve<IEntityManager>();
var verbSystem = EntitySystem.Get<SharedVerbSystem>();
// get the 'player' entity (defaulting to command user, otherwise uses a uid)
EntityUid? playerEntity = null;
if (!int.TryParse(args[0], out var intPlayerUid))
{
if (args[0] == "self" && shell.Player?.AttachedEntity != null)
@@ -39,6 +37,10 @@ namespace Content.Server.Verbs.Commands
return;
}
}
else
{
entityManager.EntityExists(new EntityUid(intPlayerUid));
}
// gets the target entity
if (!int.TryParse(args[1], out var intUid))
@@ -53,15 +55,14 @@ namespace Content.Server.Verbs.Commands
return;
}
var targetNet = new NetEntity(intUid);
if (!_entManager.TryGetEntity(targetNet, out var target))
var target = new EntityUid(intUid);
if (!entityManager.EntityExists(target))
{
shell.WriteError(Loc.GetString("list-verbs-command-invalid-target-entity"));
return;
}
var verbs = verbSystem.GetLocalVerbs(target.Value, playerEntity.Value, Verb.VerbTypes);
var verbs = verbSystem.GetLocalVerbs(target, playerEntity.Value, Verb.VerbTypes);
foreach (var verb in verbs)
{