ActionBlocker CanPickup uses EntityUid exclusively

This commit is contained in:
Vera Aguilera Puerto
2021-11-09 13:43:39 +01:00
parent b82cb38bf9
commit 9921801f15
11 changed files with 17 additions and 23 deletions

View File

@@ -4,11 +4,11 @@ namespace Content.Shared.Item
{
public class PickupAttemptEvent : CancellableEntityEventArgs
{
public PickupAttemptEvent(IEntity entity)
public PickupAttemptEvent(EntityUid uid)
{
Entity = entity;
Uid = uid;
}
public IEntity Entity { get; }
public EntityUid Uid { get; }
}
}

View File

@@ -111,7 +111,7 @@ namespace Content.Shared.Item
/// </summary>
public bool CanPickup(IEntity user, bool popup = true)
{
if (!EntitySystem.Get<ActionBlockerSystem>().CanPickup(user))
if (!EntitySystem.Get<ActionBlockerSystem>().CanPickup(user.Uid))
return false;
if (user.Transform.MapID != Owner.Transform.MapID)