* Meandering Towershell - Fixed that it did not return to attack if no other creature was on the battlefield that could attack.

This commit is contained in:
LevelX2 2014-09-20 17:40:46 +02:00
parent a95083b7d2
commit 96b2d7f2a6
3 changed files with 16 additions and 4 deletions

View file

@ -195,7 +195,9 @@ public class Combat implements Serializable, Copyable<Combat> {
Player player = game.getPlayer(attackerId);
//20101001 - 508.1d
checkAttackRequirements(player, game);
player.selectAttackers(game, attackerId);
if (!game.getPlayer(game.getActivePlayerId()).getAvailableAttackers(game).isEmpty()) {
player.selectAttackers(game, attackerId);
}
if (game.isPaused() || game.gameOver(null)) {
return;
}

View file

@ -52,9 +52,6 @@ public class DeclareAttackersStep extends Step {
@Override
public boolean skipStep(Game game, UUID activePlayerId) {
if (game.getPlayer(activePlayerId).getAvailableAttackers(game).isEmpty()) {
return true;
}
return super.skipStep(game, activePlayerId);
}