ActionBlocker CanPickup uses EntityUid exclusively
This commit is contained in:
@@ -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; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user