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

Remove InteractedWithEvent and friends. (#11939)

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-26 14:15:48 +13:00
committed by GitHub
parent b03f17bda2
commit c0b657ca18
21 changed files with 133 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,17 +84,7 @@ namespace Content.Server.Verbs
// first, lets log the verb. Just in case it ends up crashing the server or something.
LogVerb(verb, user, target, forced);
// then invoke any relevant actions
verb.Act?.Invoke();
// Maybe raise a local event
if (verb.ExecutionEventArgs != null)
{
if (verb.EventTarget.IsValid())
RaiseLocalEvent(verb.EventTarget, verb.ExecutionEventArgs, true);
else
RaiseLocalEvent(verb.ExecutionEventArgs);
}
base.ExecuteVerb(verb, user, target, forced);
}
public void LogVerb(Verb verb, EntityUid user, EntityUid target, bool forced)