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

Remove IRangedInteract (#6374)

Browse Source 
* Remove IRangedInteract

Apparently this has been gone for a while anyway.

* Also this woops
This commit is contained in:
metalgearsloth
2022-01-30 03:58:59 +11:00
committed by GitHub
parent fb2145fae8
commit ee179762fd
2 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Interaction/InteractionSystem.cs
View File

@@ -273,21 +273,9 @@ namespace Content.Server.Interaction
{
var rangedMsg = new RangedInteractEvent(user, used, target.Value, clickLocation);
RaiseLocalEvent(target.Value, rangedMsg);
if (rangedMsg.Handled)
return true;
var rangedInteractions = AllComps<IRangedInteract>(target.Value).ToList();
var rangedInteractionEventArgs = new RangedInteractEventArgs(user, used, clickLocation);
// See if we have a ranged interaction
foreach (var t in rangedInteractions)
{
// If an InteractUsingRanged returns a status completion we finish our interaction
#pragma warning disable 618
if (t.RangedInteract(rangedInteractionEventArgs))
#pragma warning restore 618
return true;
}
}
return await InteractDoAfter(user, used, inRangeUnobstructed ? target : null, clickLocation, false);