diff --git a/Mage/src/mage/players/Player.java b/Mage/src/mage/players/Player.java index 4df1a5dd8df..05fef388096 100644 --- a/Mage/src/mage/players/Player.java +++ b/Mage/src/mage/players/Player.java @@ -42,7 +42,6 @@ import mage.abilities.costs.mana.VariableManaCost; import mage.abilities.effects.ReplacementEffect; import mage.cards.Card; import mage.cards.Cards; -import mage.cards.decks.Deck; import mage.choices.Choice; import mage.counters.Counters; import mage.game.events.GameEvent; @@ -73,7 +72,7 @@ public interface Player extends MageItem { public Cards getHand(); public boolean isPassed(); public boolean isEmptyDraw(); - public void resetPriority(); + public void resetPassed(); public boolean hasLost(); public boolean hasWon(); public boolean hasLeft(); diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java index 0a0ac7a5bbe..ebfc8561532 100644 --- a/Mage/src/mage/players/PlayerImpl.java +++ b/Mage/src/mage/players/PlayerImpl.java @@ -388,6 +388,9 @@ public abstract class PlayerImpl implements Player, Serializable { result = playAbility((ActivatedAbility)ability.copy(), game); } + //if player has taken an action then reset all player passed flags + if (result) + game.getPlayers().resetPassed(); return result; } @@ -586,7 +589,7 @@ public abstract class PlayerImpl implements Player, Serializable { } @Override - public void resetPriority() { + public void resetPassed() { passed = false; } diff --git a/Mage/src/mage/players/Players.java b/Mage/src/mage/players/Players.java index 7b99688a315..06a5f97d9c6 100644 --- a/Mage/src/mage/players/Players.java +++ b/Mage/src/mage/players/Players.java @@ -41,9 +41,9 @@ public class Players extends LinkedHashMap { this.put(player.getId(), player); } - public void resetPriority() { + public void resetPassed() { for (Player player: this.values()) { - player.resetPriority(); + player.resetPassed(); } } }