Make combat check CanInteract (#7046)

2022-03-09 19:40:07 +13:00
parent d691161542
commit 17132385d4
8 changed files with 14 additions and 30 deletions
--- a/Content.Server/Interaction/InteractionSystem.cs
+++ b/Content.Server/Interaction/InteractionSystem.cs
@@ -298,6 +298,11 @@ namespace Content.Server.Interaction
            if (!ValidateInteractAndFace(user, coordinates))
                return;

+            // Check general interaction blocking.
+            if (!_actionBlockerSystem.CanInteract(user, target))
+                return;
+
+            // Check combat-specific action blocking.
            if (!_actionBlockerSystem.CanAttack(user, target))
                return;