* Fixed and extended extra turn test.

This commit is contained in:
LevelX2 2016-11-26 13:46:10 +01:00
parent db831202da
commit 8bf299e342
4 changed files with 145 additions and 82 deletions

View file

@ -133,11 +133,11 @@ public abstract class Phase implements Serializable {
}
private boolean checkStopOnStepOption(Game game) {
if (game.getOptions().stopOnTurn != null && game.getOptions().stopAtStep == getStep().getType()) {
if (game.getOptions().stopOnTurn <= game.getState().getTurnNum()) {
game.pause();
return true;
}
if (game.getOptions().stopOnTurn != null
&& game.getOptions().stopOnTurn <= game.getState().getTurnNum()
&& game.getOptions().stopAtStep == getStep().getType()) {
game.pause();
return true;
}
return false;
}