From 5a1876ea7c13e881063332bf2c625c9b42f00d56 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 22 Apr 2013 15:39:56 +0000 Subject: [PATCH] minor: player can be attacked only if it is in the defenders list --- src/main/java/forge/control/input/InputAttack.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/control/input/InputAttack.java b/src/main/java/forge/control/input/InputAttack.java index 0b994c7abf3..fe4063d934a 100644 --- a/src/main/java/forge/control/input/InputAttack.java +++ b/src/main/java/forge/control/input/InputAttack.java @@ -96,8 +96,10 @@ public class InputAttack extends InputBase { @Override public void selectPlayer(Player selected) { - if(player.isOpponentOf(selected)) + if(defenders.contains(selected)) setCurrentDefender(selected); + else + SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); // cannot attack that player } /** {@inheritDoc} */ @@ -144,7 +146,7 @@ public class InputAttack extends InputBase { SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); } } // selectCard() - + private final void setCurrentDefender(GameEntity def) { Set toUpdate = new HashSet(); currentDefender = def; @@ -159,7 +161,8 @@ public class InputAttack extends InputBase { } } - showMessage("Declare Attackers.\nSelecting Creatures to Attack " + currentDefender + "\n\nTo attack other players or their planewalkers just click on them"); + showMessage("Declare Attackers.\nSelecting Creatures to Attack " + currentDefender + + "\n\nTo attack other players or their planewalkers just click on them"); // This will instantly highlight targets for(MyObservable updateable : toUpdate) {