external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Reorganized the code a bit (for auto-yield shortcuts).

Browse Source
This commit is contained in:
Agetian
2015-09-10 07:27:53 +00:00
parent 31d8ba32b6
commit 6ac30a1302
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java
View File

@@ -139,10 +139,10 @@ public class KeyboardShortcuts {
if (!Singletons.getControl().getCurrentScreen().isMatchScreen()) { return; } if (!Singletons.getControl().getCurrentScreen().isMatchScreen()) { return; }
if (matchUI == null) { return; } if (matchUI == null) { return; }
StackItemView si = matchUI.getGameView().peekStack(); StackItemView si = matchUI.getGameView().peekStack();
if (si != null && si.isAbility()) { if (si != null && si.isAbility() && matchUI.isLocalPlayer(si.getActivatingPlayer())) {
matchUI.setShouldAutoYield(si.getKey(), true); matchUI.setShouldAutoYield(si.getKey(), true);
int triggerID = Integer.valueOf(si.getSourceTrigger()); int triggerID = Integer.valueOf(si.getSourceTrigger());
if (si.isOptionalTrigger() && matchUI.isLocalPlayer(si.getActivatingPlayer())) { if (si.isOptionalTrigger()) {
matchUI.setShouldAlwaysAcceptTrigger(triggerID); matchUI.setShouldAlwaysAcceptTrigger(triggerID);
} }
matchUI.getGameController().passPriority(); matchUI.getGameController().passPriority();
@@ -157,10 +157,10 @@ public class KeyboardShortcuts {
if (!Singletons.getControl().getCurrentScreen().isMatchScreen()) { return; } if (!Singletons.getControl().getCurrentScreen().isMatchScreen()) { return; }
if (matchUI == null) { return; } if (matchUI == null) { return; }
StackItemView si = matchUI.getGameView().peekStack(); StackItemView si = matchUI.getGameView().peekStack();
if (si != null && si.isAbility()) { if (si != null && si.isAbility() && matchUI.isLocalPlayer(si.getActivatingPlayer())) {
matchUI.setShouldAutoYield(si.getKey(), true); matchUI.setShouldAutoYield(si.getKey(), true);
int triggerID = Integer.valueOf(si.getSourceTrigger()); int triggerID = Integer.valueOf(si.getSourceTrigger());
if (si.isOptionalTrigger() && matchUI.isLocalPlayer(si.getActivatingPlayer())) { if (si.isOptionalTrigger()) {
matchUI.setShouldAlwaysDeclineTrigger(triggerID); matchUI.setShouldAlwaysDeclineTrigger(triggerID);
} }
matchUI.getGameController().passPriority(); matchUI.getGameController().passPriority();