Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Verbs/Commands/InvokeVerbCommand.cs
View File

@@ -78,7 +78,7 @@ namespace Content.Server.Verbs.Commands
verbs.TryGetValue(key, out var vset) &&
vset.Any())
{
verbSystem.ExecuteVerb(vset.First(), playerEntity.Uid, target.Uid, forced: true);
verbSystem.ExecuteVerb(vset.First(), playerEntity, target, forced: true);
shell.WriteLine(Loc.GetString("invoke-verb-command-success", ("verb", verbName), ("target", target), ("player", playerEntity)));
return;
}
@@ -89,7 +89,7 @@ namespace Content.Server.Verbs.Commands
{
if (verb.Text.ToLowerInvariant() == verbName)
{
verbSystem.ExecuteVerb(verb, playerEntity.Uid, target.Uid, forced: true);
verbSystem.ExecuteVerb(verb, playerEntity, target, forced: true);
shell.WriteLine(Loc.GetString("invoke-verb-command-success", ("verb", verb.Text), ("target", target), ("player", playerEntity)));
return;
}

2
Content.Server/Verbs/VerbSystem.cs
View File

@@ -45,7 +45,7 @@ namespace Content.Server.Verbs
// Find the requested verb.
if (verbs.TryGetValue(args.RequestedVerb, out var verb))
ExecuteVerb(verb, userEntity.Uid, args.Target);
ExecuteVerb(verb, userEntity, args.Target);
else
// 404 Verb not found. Note that this could happen due to something as simple as opening the verb menu, walking away, then trying
// to run the pickup-item verb. So maybe this shouldn't even be logged?