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

Fix crash when starting next game of match

Browse Source
This commit is contained in:
drdev
2014-09-23 19:24:14 +00:00
parent d4b46dbf8b
commit c10c90e075
6 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
forge-gui/src/main/java/forge/match/input/InputBase.java
View File

@@ -67,7 +67,7 @@ public abstract class InputBase implements java.io.Serializable, Input {
finished = true;
if (allowAwaitNextInput()) {
awaitNextInput(this);
awaitNextInput(getGameView());
}
}
@@ -78,18 +78,17 @@ public abstract class InputBase implements java.io.Serializable, Input {
private static final Timer awaitNextInputTimer = new Timer();
private static TimerTask awaitNextInputTask;
public static void awaitNextInput(final Input input) {
public static void awaitNextInput(final LocalGameView gameView) {
//delay updating prompt to await next input briefly so buttons don't flicker disabled then enabled
awaitNextInputTask = new TimerTask() {
@Override
public void run() {
FThreads.invokeInEdtLater(input.getGui(), new Runnable() {
FThreads.invokeInEdtLater(gameView.getGui(), new Runnable() {
@Override
public void run() {
synchronized (awaitNextInputTimer) {
if (awaitNextInputTask != null) {
input.getGui().showPromptMessage(input.getOwner(), "Waiting for opponent...");
ButtonUtil.update(input, false, false, false);
updatePromptForAwait(gameView);
awaitNextInputTask = null;
}
}
@@ -100,6 +99,22 @@ public abstract class InputBase implements java.io.Serializable, Input {
awaitNextInputTimer.schedule(awaitNextInputTask, 250);
}
public static void waitForHumanOpponent(final LocalGameView gameView) {
cancelAwaitNextInput();
FThreads.invokeInEdtNowOrLater(gameView.getGui(), new Runnable() {
@Override
public void run() {
updatePromptForAwait(gameView);
}
});
}
private static void updatePromptForAwait(final LocalGameView gameView) {
InputNone inputNone = new InputNone(gameView);
inputNone.getGui().showPromptMessage(inputNone.getOwner(), "Waiting for opponent...");
ButtonUtil.update(inputNone, false, false, false);
}
public static void cancelAwaitNextInput() {
synchronized (awaitNextInputTimer) { //ensure task doesn't reset awaitNextInputTask during this block
if (awaitNextInputTask != null) {

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -819,7 +819,7 @@ public class PlayerControllerHuman extends PlayerController {
InputNone inputNone = new InputNone(gameView);
getGui().showPromptMessage(inputNone.getOwner(), "");
ButtonUtil.update(inputNone, false, false, false);
InputBase.awaitNextInput(inputNone);
InputBase.awaitNextInput(gameView);
}
@Override