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

This commit is contained in:
Agetian
2015-09-10 07:27:53 +00:00
parent 31d8ba32b6
commit 6ac30a1302

View File

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