ActionBlocker CanUnequip uses EntityUid exclusively
This commit is contained in:
@@ -330,7 +330,7 @@ namespace Content.Server.Inventory.Components
|
||||
/// </returns>
|
||||
public bool CanUnequip(Slots slot, bool mobCheck = true)
|
||||
{
|
||||
if (mobCheck && !EntitySystem.Get<ActionBlockerSystem>().CanUnequip(Owner))
|
||||
if (mobCheck && !EntitySystem.Get<ActionBlockerSystem>().CanUnequip(OwnerUid))
|
||||
return false;
|
||||
|
||||
var inventorySlot = _slotContainers[slot];
|
||||
|
||||
@@ -107,18 +107,12 @@ namespace Content.Shared.ActionBlocker
|
||||
return !ev.Cancelled;
|
||||
}
|
||||
|
||||
public bool CanUnequip(IEntity entity)
|
||||
{
|
||||
var ev = new UnequipAttemptEvent(entity);
|
||||
|
||||
RaiseLocalEvent(entity.Uid, ev);
|
||||
|
||||
return !ev.Cancelled;
|
||||
}
|
||||
|
||||
public bool CanUnequip(EntityUid uid)
|
||||
{
|
||||
return CanUnequip(EntityManager.GetEntity(uid));
|
||||
var ev = new UnequipAttemptEvent(uid);
|
||||
RaiseLocalEvent(uid, ev);
|
||||
|
||||
return !ev.Cancelled;
|
||||
}
|
||||
|
||||
public bool CanChangeDirection(IEntity entity)
|
||||
|
||||
@@ -4,11 +4,11 @@ namespace Content.Shared.Inventory.Events
|
||||
{
|
||||
public class UnequipAttemptEvent : CancellableEntityEventArgs
|
||||
{
|
||||
public UnequipAttemptEvent(IEntity entity)
|
||||
public UnequipAttemptEvent(EntityUid uid)
|
||||
{
|
||||
Entity = entity;
|
||||
Uid = uid;
|
||||
}
|
||||
|
||||
public IEntity Entity { get; }
|
||||
public EntityUid Uid { get; }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user