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

15
Content.Shared/ActionBlocker/ActionBlockerSystem.cs
View File

@@ -78,9 +78,6 @@ namespace Content.Shared.ActionBlocker
var targetEv = new GettingInteractedWithAttemptEvent(user, target);
RaiseLocalEvent(target.Value, targetEv);
if (!targetEv.Cancelled)
InteractWithItem(user, target.Value);
return !targetEv.Cancelled;
}
@@ -136,11 +133,7 @@ namespace Content.Shared.ActionBlocker
var itemEv = new GettingPickedUpAttemptEvent(user, item);
RaiseLocalEvent(item, itemEv);
if (!itemEv.Cancelled)
InteractWithItem(user, item);
return !itemEv.Cancelled;
}
public bool CanEmote(EntityUid uid)
@@ -186,13 +179,5 @@ namespace Content.Shared.ActionBlocker
return !ev.Cancelled;
}
private void InteractWithItem(EntityUid user, EntityUid item)
{
var userEvent = new UserInteractedWithItemEvent(user, item);
RaiseLocalEvent(user, userEvent);
var itemEvent = new ItemInteractedWithEvent(user, item);
RaiseLocalEvent(item, itemEvent);
}
}
}