* Skip phase of preferences will only be applied if the stack is empty.

This commit is contained in:
LevelX2 2014-10-10 14:25:44 +02:00
parent 7ad45a2a6e
commit 0a23fe1e8a

View file

@ -444,12 +444,12 @@ public class HumanPlayer extends PlayerImpl {
public boolean priority(Game game) { public boolean priority(Game game) {
passed = false; passed = false;
if (!abort) { if (!abort) {
boolean dontCheckPassStep = false;
if (passedAllTurns) { if (passedAllTurns) {
pass(game); pass(game);
return false; return false;
} }
if (game.getStack().isEmpty()) { if (game.getStack().isEmpty()) {
boolean dontCheckPassStep = false;
if (passedTurn) { if (passedTurn) {
pass(game); pass(game);
return false; return false;
@ -488,11 +488,11 @@ public class HumanPlayer extends PlayerImpl {
return false; return false;
} }
} }
}
if (!dontCheckPassStep && checkPassStep(game)) { if (!dontCheckPassStep && checkPassStep(game)) {
pass(game); pass(game);
return false; return false;
} }
}
updateGameStatePriority("priority", game); updateGameStatePriority("priority", game);
game.firePriorityEvent(playerId); game.firePriorityEvent(playerId);
waitForResponse(game); waitForResponse(game);