cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Access/IdCardConsoleSystem.cs
View File

@ -53,7 +53,7 @@ namespace Content.Server.Access
if (args.Hands == null ||
!args.CanAccess ||
!args.CanInteract ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
// Can we eject a privileged ID?

2
Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
View File

@ -32,7 +32,7 @@ namespace Content.Server.Chemistry.EntitySystems
!args.CanAccess ||
!args.CanInteract ||
!component.HasBeaker ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
Verb verb = new();

2
Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
View File

@ -34,7 +34,7 @@ namespace Content.Server.Chemistry.EntitySystems
!args.CanAccess ||
!args.CanInteract ||
!component.HasBeaker ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
Verb verb = new();

2
Content.Server/Power/EntitySystems/BaseChargerSystem.cs
View File

@ -39,7 +39,7 @@ namespace Content.Server.Power.EntitySystems
!args.CanAccess ||
!args.CanInteract ||
!component.HasCell ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
Verb verb = new();

2
Content.Server/PowerCell/PowerCellSystem.cs
View File

@ -31,7 +31,7 @@ namespace Content.Server.PowerCell
!args.CanInteract ||
!component.ShowVerb ||
!component.HasCell ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
Verb verb = new();

4
Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs
View File

@ -71,7 +71,7 @@ namespace Content.Server.Weapon.Ranged.Barrels
!args.CanInteract ||
!component.PowerCellRemovable ||
component.PowerCell == null ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
Verb verb = new();
@ -104,7 +104,7 @@ namespace Content.Server.Weapon.Ranged.Barrels
!args.CanAccess ||
!args.CanInteract ||
!component.HasMagazine ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
if (component.MagNeedsOpenBolt && !component.BoltOpen)

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

@ -75,18 +75,12 @@ namespace Content.Shared.ActionBlocker
return !ev.Cancelled;
}
public bool CanPickup(IEntity entity)
{
var ev = new PickupAttemptEvent(entity);
RaiseLocalEvent(entity.Uid, ev);
return !ev.Cancelled;
}
public bool CanPickup(EntityUid uid)
{
return CanPickup(EntityManager.GetEntity(uid));
var ev = new PickupAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
return !ev.Cancelled;
}
public bool CanEmote(EntityUid uid)

2
Content.Shared/Containers/ItemSlot/SharedItemSlotsSystem.cs
View File

@ -67,7 +67,7 @@ namespace Content.Shared.Containers.ItemSlots
if (args.Hands == null ||
!args.CanAccess ||
!args.CanInteract ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
foreach (var (slotName, slot) in component.Slots)

2
Content.Shared/Hands/Components/SharedHandsComponent.cs
View File

@ -625,7 +625,7 @@ namespace Content.Shared.Hands.Components
/// <returns></returns>
protected bool PlayerCanPickup()
{
if (!IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ActionBlockerSystem>().CanPickup(Owner))
if (!EntitySystem.Get<ActionBlockerSystem>().CanPickup(Owner.Uid))
return false;
return true;

6
Content.Shared/Item/PickupAttemptEvent.cs
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; }
}
}

2
Content.Shared/Item/SharedItemComponent.cs
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)