mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 12:48:00 +00:00
A number of inputs recieve stop(); clause
This commit is contained in:
@@ -106,6 +106,7 @@ public class InputBlock extends Input {
|
||||
currentAttacker = null;
|
||||
allBlocking.clear();
|
||||
|
||||
stop();
|
||||
FControl.SINGLETON_INSTANCE.getPlayer().getController().passPriority();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,6 +59,7 @@ public class InputCleanup extends Input {
|
||||
// goes to the next phase
|
||||
if (active.isUnlimitedHandSize() || n <= max || n <= 0 || active != turnOwner) {
|
||||
active.getController().passPriority();
|
||||
stop();
|
||||
return;
|
||||
}
|
||||
ButtonUtil.disableAll();
|
||||
|
||||
@@ -25,7 +25,7 @@ import forge.game.phase.PhaseType;
|
||||
import forge.game.player.Player;
|
||||
import forge.game.player.PlayerController;
|
||||
import forge.game.zone.MagicStack;
|
||||
import forge.util.MyObservable;
|
||||
import forge.gui.match.controllers.CMessage;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -35,7 +35,7 @@ import forge.util.MyObservable;
|
||||
* @author Forge
|
||||
* @version $Id$
|
||||
*/
|
||||
public class InputControl extends MyObservable implements java.io.Serializable {
|
||||
public class InputControl implements java.io.Serializable {
|
||||
/** Constant <code>serialVersionUID=3955194449319994301L</code>. */
|
||||
private static final long serialVersionUID = 3955194449319994301L;
|
||||
|
||||
@@ -134,12 +134,13 @@ public class InputControl extends MyObservable implements java.io.Serializable {
|
||||
* @param update
|
||||
* a boolean.
|
||||
*/
|
||||
public final void resetInput() { resetInput(true); }
|
||||
public final void resetInput(final boolean update) {
|
||||
public final void resetInput() {
|
||||
this.input = null;
|
||||
if (update) {
|
||||
this.updateObservers();
|
||||
}
|
||||
this.updateObservers();
|
||||
}
|
||||
|
||||
private void updateObservers() {
|
||||
CMessage.SINGLETON_INSTANCE.getInputControl().invalidate();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -179,6 +179,7 @@ public class InputMulligan extends Input {
|
||||
SDisplayUtil.showTab(nextField);
|
||||
|
||||
game.getPhaseHandler().nextPhase();
|
||||
stop();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -75,6 +75,7 @@ public class InputPassPriority extends Input {
|
||||
@Override
|
||||
public final void selectButtonOK() {
|
||||
FControl.SINGLETON_INSTANCE.getPlayer().getController().passPriority();
|
||||
stop();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
|
||||
@@ -108,6 +108,7 @@ public class AiInputCommon extends Input {
|
||||
}
|
||||
}
|
||||
player.getController().passPriority();
|
||||
stop();
|
||||
} // getMessage();
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user