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

This changes input back to single-threaded model.

Browse Source
This commit is contained in:
Maxmtg
2013-03-10 14:46:48 +00:00
parent 71287b2dbf
commit 40641f2b41
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/game/MatchController.java
View File

@@ -162,10 +162,12 @@ public class MatchController {
getInput().clearInput(); getInput().clearInput();
getInput().resetInput(); getInput().resetInput();
getInput().setNewInput(currentGame);
Thread thGame = new GameInputUpdatesThread(this, currentGame);
thGame.setName("Game input updater"); // Thread thGame = new GameInputUpdatesThread(this, currentGame);
thGame.start(); // thGame.setName("Game input updater");
// thGame.start();
// TODO restore this functionality!!! // TODO restore this functionality!!!
//VMatchUI.SINGLETON_INSTANCE.getViewDevMode().getDocument().setVisible(Preferences.DEV_MODE); //VMatchUI.SINGLETON_INSTANCE.getViewDevMode().getDocument().setVisible(Preferences.DEV_MODE);

3
src/main/java/forge/gui/InputProxy.java
View File

@@ -21,6 +21,7 @@ import java.util.Observable;
import java.util.Observer; import java.util.Observer;
import forge.Card; import forge.Card;
import forge.Singletons;
import forge.control.input.Input; import forge.control.input.Input;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.zone.PlayerZone; import forge.game.zone.PlayerZone;
@@ -44,6 +45,8 @@ public class InputProxy implements Observer {
public final synchronized void update(final Observable observable, final Object obj) { public final synchronized void update(final Observable observable, final Object obj) {
ButtonUtil.disableAll(); ButtonUtil.disableAll();
valid = false; valid = false;
Singletons.getModel().getMatch().getInput().setNewInput(Singletons.getModel().getGame());
} }
/** /**
* <p> * <p>