From 284e2257f35401b7da931742369a0ac04c0ff55d Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 16 Nov 2013 21:43:57 +0000 Subject: [PATCH] Fix Cascade --- .../forge/game/player/PlayerControllerHuman.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java index 06f1d6feb58..fc20a1ac354 100644 --- a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java @@ -90,19 +90,13 @@ public class PlayerControllerHuman extends PlayerController { */ public SpellAbility getAbilityToPlay(List abilities, MouseEvent triggerEvent) { if (triggerEvent == null) { - List playableAbilities = new ArrayList(); - for (SpellAbility ab : abilities) { - if (ab.canPlay()) { - playableAbilities.add(ab); - } - } - if (playableAbilities.isEmpty()) { + if (abilities.isEmpty()) { return null; } - if (playableAbilities.size() == 1 && !playableAbilities.get(0).promptIfOnlyPossibleAbility()) { - return playableAbilities.get(0); + if (abilities.size() == 1) { + return abilities.get(0); } - return GuiChoose.oneOrNone("Choose ability to play", playableAbilities); + return GuiChoose.oneOrNone("Choose ability to play", abilities); } if (abilities.isEmpty()) {