mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 04:08:01 +00:00
reverting 19970 as it must have ruined all those ETB effects
This commit is contained in:
@@ -106,7 +106,6 @@ public class InputBlock extends Input {
|
|||||||
currentAttacker = null;
|
currentAttacker = null;
|
||||||
allBlocking.clear();
|
allBlocking.clear();
|
||||||
|
|
||||||
stop();
|
|
||||||
FControl.SINGLETON_INSTANCE.getPlayer().getController().passPriority();
|
FControl.SINGLETON_INSTANCE.getPlayer().getController().passPriority();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ public class InputCleanup extends Input {
|
|||||||
// goes to the next phase
|
// goes to the next phase
|
||||||
if (active.isUnlimitedHandSize() || n <= max || n <= 0 || active != turnOwner) {
|
if (active.isUnlimitedHandSize() || n <= max || n <= 0 || active != turnOwner) {
|
||||||
active.getController().passPriority();
|
active.getController().passPriority();
|
||||||
stop();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ButtonUtil.disableAll();
|
ButtonUtil.disableAll();
|
||||||
|
|||||||
@@ -179,7 +179,6 @@ public class InputMulligan extends Input {
|
|||||||
SDisplayUtil.showTab(nextField);
|
SDisplayUtil.showTab(nextField);
|
||||||
|
|
||||||
game.getPhaseHandler().nextPhase();
|
game.getPhaseHandler().nextPhase();
|
||||||
stop();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ public class InputPassPriority extends Input {
|
|||||||
@Override
|
@Override
|
||||||
public final void selectButtonOK() {
|
public final void selectButtonOK() {
|
||||||
FControl.SINGLETON_INSTANCE.getPlayer().getController().passPriority();
|
FControl.SINGLETON_INSTANCE.getPlayer().getController().passPriority();
|
||||||
stop();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** {@inheritDoc} */
|
/** {@inheritDoc} */
|
||||||
|
|||||||
@@ -108,7 +108,6 @@ public class AiInputCommon extends Input {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
player.getController().passPriority();
|
player.getController().passPriority();
|
||||||
stop();
|
|
||||||
} // getMessage();
|
} // getMessage();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user