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

ActionBlocker CanDrop uses EntityUid exclusively

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 13:23:50 +01:00
parent 190612a350
commit 51e785c0fd
11 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ using Robust.Shared.Localization;
namespace Content.Server.Access
{
public class IdCardConsoleSystem : EntitySystem
public class IdCardConsoleSystem : EntitySystem
{
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
@@ -24,10 +24,10 @@ namespace Content.Server.Access
!args.CanAccess ||
!args.CanInteract ||
!args.Using.HasComponent<IdCardComponent>() ||
!_actionBlockerSystem.CanDrop(args.User))
!_actionBlockerSystem.CanDrop(args.User.Uid))
return;
// Can we insert a privileged ID?
// Can we insert a privileged ID?
if (component.PrivilegedIDEmpty)
{
Verb verb = new();
@@ -56,7 +56,7 @@ namespace Content.Server.Access
!_actionBlockerSystem.CanPickup(args.User))
return;
// Can we eject a privileged ID?
// Can we eject a privileged ID?
if (!component.PrivilegedIDEmpty)
{
Verb verb = new();

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

@@ -53,7 +53,7 @@ namespace Content.Server.Chemistry.EntitySystems
!args.CanInteract ||
component.HasBeaker ||
!args.Using.HasComponent<FitsInDispenserComponent>() ||
!_actionBlockerSystem.CanDrop(args.User))
!_actionBlockerSystem.CanDrop(args.User.Uid))
return;
Verb verb = new();

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

@@ -56,7 +56,7 @@ namespace Content.Server.Chemistry.EntitySystems
!args.CanInteract ||
component.HasBeaker ||
!args.Using.HasComponent<FitsInDispenserComponent>() ||
!_actionBlockerSystem.CanDrop(args.User))
!_actionBlockerSystem.CanDrop(args.User.Uid))
return;
Verb verb = new();

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

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

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

@@ -48,7 +48,7 @@ namespace Content.Server.PowerCell
!args.CanInteract ||
component.HasCell ||
!args.Using.HasComponent<PowerCellComponent>() ||
!_actionBlockerSystem.CanDrop(args.User))
!_actionBlockerSystem.CanDrop(args.User.Uid))
return;
Verb verb = new();

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

@@ -88,7 +88,7 @@ namespace Content.Server.Weapon.Ranged.Barrels
!args.CanInteract ||
component.PowerCell != null ||
!args.Using.HasComponent<BatteryComponent>() ||
!_actionBlockerSystem.CanDrop(args.User))
!_actionBlockerSystem.CanDrop(args.User.Uid))
return;
Verb verb = new();
@@ -135,7 +135,7 @@ namespace Content.Server.Weapon.Ranged.Barrels
// Are we holding a mag that we can insert?
if (args.Using == null ||
!component.CanInsertMagazine(args.User, args.Using) ||
!_actionBlockerSystem.CanDrop(args.User))
!_actionBlockerSystem.CanDrop(args.User.Uid))
return;
// Insert mag verb

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

@@ -54,7 +54,6 @@ namespace Content.Shared.ActionBlocker
public bool CanThrow(EntityUid uid)
{
var ev = new ThrowAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
return !ev.Cancelled;
@@ -63,24 +62,17 @@ namespace Content.Shared.ActionBlocker
public bool CanSpeak(EntityUid uid)
{
var ev = new SpeakAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
return !ev.Cancelled;
}
public bool CanDrop(IEntity entity)
{
var ev = new DropAttemptEvent(entity);
RaiseLocalEvent(entity.Uid, ev);
return !ev.Cancelled;
}
public bool CanDrop(EntityUid uid)
{
return CanDrop(EntityManager.GetEntity(uid));
var ev = new DropAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
return !ev.Cancelled;
}
public bool CanPickup(IEntity entity)

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

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

6
Content.Shared/DragDrop/DropAttemptEvent.cs
View File

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

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

@@ -430,7 +430,7 @@ namespace Content.Shared.Hands.Components
/// </summary>
private bool PlayerCanDrop()
{
if (!IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ActionBlockerSystem>().CanDrop(Owner))
if (!IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ActionBlockerSystem>().CanDrop(OwnerUid))
return false;
return true;

2
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -660,7 +660,7 @@ namespace Content.Shared.Interaction
/// </summary>
public bool TryDroppedInteraction(IEntity user, IEntity item, bool intentional)
{
if (user == null || item == null || !_actionBlockerSystem.CanDrop(user)) return false;
if (user == null || item == null || !_actionBlockerSystem.CanDrop(user.Uid)) return false;
DroppedInteraction(user, item, intentional);
return true;