Reduce action blocker uses and add target entity to CanInteract (#6655)
This commit is contained in:
@@ -149,7 +149,6 @@ namespace Content.Server.Cuffs.Components
|
||||
if (_cuffing) return true;
|
||||
|
||||
if (eventArgs.Target is not {Valid: true} target ||
|
||||
!EntitySystem.Get<ActionBlockerSystem>().CanUse(eventArgs.User) ||
|
||||
!_entities.TryGetComponent<CuffableComponent?>(eventArgs.Target.Value, out var cuffed))
|
||||
{
|
||||
return false;
|
||||
|
||||
@@ -83,7 +83,7 @@ namespace Content.Server.Cuffs
|
||||
else
|
||||
{
|
||||
// Check if the user can interact.
|
||||
if (!_actionBlockerSystem.CanInteract(args.User))
|
||||
if (!_actionBlockerSystem.CanInteract(args.User, args.Target))
|
||||
{
|
||||
args.Cancel();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user