From 91f0d428eb7d2719fde56fddf2f2e083609835e8 Mon Sep 17 00:00:00 2001 From: Agetian Date: Fri, 11 Sep 2015 19:14:52 +0000 Subject: [PATCH] - Only set "Always Yes"/"Always No" for the player's own abilities when using the shortcuts. --- .../src/main/java/forge/control/KeyboardShortcuts.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java b/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java index 601bd602c12..990d0b4af54 100644 --- a/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java +++ b/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java @@ -142,7 +142,7 @@ public class KeyboardShortcuts { if (si != null && si.isAbility()) { matchUI.setShouldAutoYield(si.getKey(), true); int triggerID = Integer.valueOf(si.getSourceTrigger()); - if (si.isOptionalTrigger()) { + if (si.isOptionalTrigger() && matchUI.isLocalPlayer(si.getActivatingPlayer())) { matchUI.setShouldAlwaysAcceptTrigger(triggerID); } matchUI.getGameController().passPriority(); @@ -160,7 +160,7 @@ public class KeyboardShortcuts { if (si != null && si.isAbility()) { matchUI.setShouldAutoYield(si.getKey(), true); int triggerID = Integer.valueOf(si.getSourceTrigger()); - if (si.isOptionalTrigger()) { + if (si.isOptionalTrigger() && matchUI.isLocalPlayer(si.getActivatingPlayer())) { matchUI.setShouldAlwaysDeclineTrigger(triggerID); } matchUI.getGameController().passPriority();