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

Fix crash on payment with Channel

Browse Source
This commit is contained in:
tool4EvEr
2021-06-03 10:39:50 +02:00
parent 196b48cbd3
commit 1af8cee719
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java
View File

@@ -66,6 +66,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
@Override @Override
protected void onStop() { protected void onStop() {
if (!isFinished()) {
// Clear current Mana cost being paid for SA // Clear current Mana cost being paid for SA
saPaidFor.setManaCostBeingPaid(null); saPaidFor.setManaCostBeingPaid(null);
player.popPaidForSA(); player.popPaidForSA();
@@ -74,6 +75,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
getController().getGui().hideManaPool(PlayerView.get(player)); getController().getGui().hideManaPool(PlayerView.get(player));
} }
} }
}
@Override @Override
protected boolean onCardSelected(final Card card, final List<Card> otherCardsToSelect, final ITriggerEvent triggerEvent) { protected boolean onCardSelected(final Card card, final List<Card> otherCardsToSelect, final ITriggerEvent triggerEvent) {

4
forge-gui/src/main/java/forge/gamemodes/match/input/InputSyncronizedBase.java
View File

@@ -36,8 +36,6 @@ public abstract class InputSyncronizedBase extends InputBase implements InputSyn
} }
protected final void stop() { protected final void stop() {
onStop();
// ensure input won't accept any user actions. // ensure input won't accept any user actions.
FThreads.invokeInEdtNowOrLater(new Runnable() { FThreads.invokeInEdtNowOrLater(new Runnable() {
@Override @Override
@@ -46,6 +44,8 @@ public abstract class InputSyncronizedBase extends InputBase implements InputSyn
} }
}); });
onStop();
// thread irrelevant // thread irrelevant
if (getController().getInputQueue().getInput() != null) { if (getController().getInputQueue().getInput() != null) {
getController().getInputQueue().removeInput(InputSyncronizedBase.this); getController().getInputQueue().removeInput(InputSyncronizedBase.this);