Reduce action blocker uses and add target entity to CanInteract (#6655)

This commit is contained in:
Leon Friedrich
2022-02-15 17:06:52 +13:00
committed by GitHub
parent 334568dad2
commit ad9ddf1552
60 changed files with 286 additions and 402 deletions

View File

@@ -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;

View File

@@ -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();
}