Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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