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

ActionBlocker CanDrop uses EntityUid exclusively

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 13:23:50 +01:00
parent 190612a350
commit 51e785c0fd
11 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,6 @@ namespace Content.Shared.ActionBlocker
public bool CanThrow(EntityUid uid)
{
var ev = new ThrowAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
return !ev.Cancelled;
@@ -63,24 +62,17 @@ namespace Content.Shared.ActionBlocker
public bool CanSpeak(EntityUid uid)
{
var ev = new SpeakAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
return !ev.Cancelled;
}
public bool CanDrop(IEntity entity)
{
var ev = new DropAttemptEvent(entity);
RaiseLocalEvent(entity.Uid, ev);
return !ev.Cancelled;
}
public bool CanDrop(EntityUid uid)
{
return CanDrop(EntityManager.GetEntity(uid));
var ev = new DropAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
return !ev.Cancelled;
}
public bool CanPickup(IEntity entity)