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

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