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

ActionBlocker CanAttack uses EntityUid exclusively

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 13:40:27 +01:00
parent 51e785c0fd
commit d4ded87448
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ namespace Content.Shared.ActionBlocker
return !ev.Cancelled;
}
public bool CanDrop(EntityUid uid)
{
var ev = new DropAttemptEvent(uid);
@@ -103,18 +103,12 @@ namespace Content.Shared.ActionBlocker
return CanEmote(EntityManager.GetEntity(uid));
}
public bool CanAttack(IEntity entity)
{
var ev = new AttackAttemptEvent(entity);
RaiseLocalEvent(entity.Uid, ev);
return !ev.Cancelled;
}
public bool CanAttack(EntityUid uid)
{
return CanAttack(EntityManager.GetEntity(uid));
var ev = new AttackAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
return !ev.Cancelled;
}
public bool CanEquip(IEntity entity)