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

Experimental fix for Attacking/Passing race condition

Browse Source
This commit is contained in:
Sol
2017-12-19 03:03:35 +00:00
parent fc29cec8c8
commit 27a2d7f642
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui/src/main/java/forge/match/input/InputAttack.java
View File

@@ -83,12 +83,12 @@ public class InputAttack extends InputSyncronizedBase {
} }
private void updatePrompt() { private void updatePrompt() {
if (canCallBackAttackers()) { String alphaLabel = canCallBackAttackers() ? "Call Back" : "AlphaStrike";
getController().getGui().updateButtons(getOwner(), "OK", "Call Back", true, true, true); getController().getGui().updateButtons(getOwner(), "OK", alphaLabel, true, true, true);
} }
else {
getController().getGui().updateButtons(getOwner(), "OK", "Alpha Strike", true, true, true); private void disablePrompt() {
} getController().getGui().updateButtons(getOwner(), "Disabled", "Disabled", false, false, false);
} }
@Override @Override
@@ -154,6 +154,7 @@ public class InputAttack extends InputSyncronizedBase {
@Override @Override
protected final boolean onCardSelected(final Card card, final List<Card> otherCardsToSelect, final ITriggerEvent triggerEvent) { protected final boolean onCardSelected(final Card card, final List<Card> otherCardsToSelect, final ITriggerEvent triggerEvent) {
disablePrompt();
final List<Card> att = combat.getAttackers(); final List<Card> att = combat.getAttackers();
if (triggerEvent != null && triggerEvent.getButton() == 3 && att.contains(card)) { if (triggerEvent != null && triggerEvent.getButton() == 3 && att.contains(card)) {
undeclareAttacker(card); undeclareAttacker(card);
@@ -209,6 +210,7 @@ public class InputAttack extends InputSyncronizedBase {
if (card.getController().isOpponentOf(playerAttacks)) { if (card.getController().isOpponentOf(playerAttacks)) {
if (defenders.contains(card)) { // planeswalker? if (defenders.contains(card)) { // planeswalker?
setCurrentDefender(card); setCurrentDefender(card);
updateMessage();
return true; return true;
} }
} }
@@ -233,6 +235,7 @@ public class InputAttack extends InputSyncronizedBase {
return true; return true;
} }
updatePrompt();
return false; return false;
} }
@@ -326,6 +329,7 @@ public class InputAttack extends InputSyncronizedBase {
showMessage(message); showMessage(message);
updatePrompt(); updatePrompt();
getController().getGui().showCombat(); // redraw sword icons getController().getGui().showCombat(); // redraw sword icons
} }
} }