diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index d863a522bc..f318a84dc5 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -488,10 +488,19 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> { public void selectAttackers(Game game) { game.getState().setPriorityPlayerId(getId()); while (!abort) { + if (passedAllTurns || passedTurn) { + return; + } game.fireSelectEvent(playerId, "Select attackers"); waitForResponse(); if (response.getBoolean() != null) { return; + } else if (response.getInteger() != null) { + if (response.getInteger() == -9999) { + passedAllTurns = true; + } + passedTurn = true; + return; } else if (response.getUUID() != null) { Permanent attacker = game.getPermanent(response.getUUID()); if (attacker != null) { @@ -530,6 +539,12 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> { waitForResponse(); if (response.getBoolean() != null) { return; + } else if (response.getInteger() != null) { + if (response.getInteger() == -9999) { + passedAllTurns = true; + } + passedTurn = true; + return; } else if (response.getUUID() != null) { Permanent blocker = game.getPermanent(response.getUUID()); if (blocker != null) { diff --git a/Mage.Server/plugins/mage-player-human.jar b/Mage.Server/plugins/mage-player-human.jar index bcd7b9afe2..5315b0e39a 100644 Binary files a/Mage.Server/plugins/mage-player-human.jar and b/Mage.Server/plugins/mage-player-human.jar differ