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

minor rearrange of statements

Browse Source
This commit is contained in:
Maxmtg
2013-04-04 05:26:32 +00:00
parent 16414982a8
commit 628260b1fb
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/control/input/InputControl.java
View File

@@ -125,15 +125,14 @@ public class InputControl extends MyObservable implements java.io.Serializable {
*/ */
public final Input getActualInput(GameState game) { public final Input getActualInput(GameState game) {
GameAge age = game.getAge(); GameAge age = game.getAge();
if ( age == GameAge.BeforeMulligan || age == GameAge.GameOver)
return inputLock;
if ( age == GameAge.Mulligan ) { if ( age == GameAge.Mulligan ) {
HumanPlayer human = Singletons.getControl().getPlayer(); HumanPlayer human = Singletons.getControl().getPlayer();
return game.getType() == GameType.Commander ? new InputPartialParisMulligan(match, human) : new InputMulligan(match, human); return game.getType() == GameType.Commander ? new InputPartialParisMulligan(match, human) : new InputMulligan(match, human);
} }
if ( age != GameAge.Play )
return inputLock;
if (!this.inputStack.isEmpty()) { // incoming input to Control if (!this.inputStack.isEmpty()) { // incoming input to Control
return this.inputStack.peek(); return this.inputStack.peek();
} }