diff --git a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs index d251d66898..5204aa01be 100644 --- a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs +++ b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs @@ -14,9 +14,9 @@ public sealed class RunVerbAsCommand : ToolshedCommand private SharedVerbSystem? _verb; [CommandImplementation] - public IEnumerable RunVerbAs( + public IEnumerable RunVerbAs( IInvocationContext ctx, - [PipedArgument] IEnumerable input, + [PipedArgument] IEnumerable input, EntityUid runner, string verb ) @@ -24,7 +24,7 @@ public sealed class RunVerbAsCommand : ToolshedCommand _verb ??= GetSys(); verb = verb.ToLowerInvariant(); - foreach (var i in input) + foreach (var eId in input) { if (EntityManager.Deleted(runner) && runner.IsValid()) ctx.ReportError(new DeadEntity(runner)); @@ -32,7 +32,6 @@ public sealed class RunVerbAsCommand : ToolshedCommand if (ctx.GetErrors().Any()) yield break; - var eId = EntityManager.GetEntity(i); var verbs = _verb.GetLocalVerbs(eId, runner, Verb.VerbTypes, true); // if the "verb name" is actually a verb-type, try run any verb of that type. @@ -43,7 +42,7 @@ public sealed class RunVerbAsCommand : ToolshedCommand if (verbTy != null) { _verb.ExecuteVerb(verbTy, runner, eId, forced: true); - yield return i; + yield return eId; } } @@ -52,7 +51,7 @@ public sealed class RunVerbAsCommand : ToolshedCommand if (verbTy.Text.ToLowerInvariant() == verb) { _verb.ExecuteVerb(verbTy, runner, eId, forced: true); - yield return i; + yield return eId; } } }