Fix Cascade

This commit is contained in:
drdev
2013-11-16 21:43:57 +00:00
parent ec06d07f35
commit 284e2257f3

View File

@@ -90,19 +90,13 @@ public class PlayerControllerHuman extends PlayerController {
*/ */
public SpellAbility getAbilityToPlay(List<SpellAbility> abilities, MouseEvent triggerEvent) { public SpellAbility getAbilityToPlay(List<SpellAbility> abilities, MouseEvent triggerEvent) {
if (triggerEvent == null) { if (triggerEvent == null) {
List<SpellAbility> playableAbilities = new ArrayList<SpellAbility>(); if (abilities.isEmpty()) {
for (SpellAbility ab : abilities) {
if (ab.canPlay()) {
playableAbilities.add(ab);
}
}
if (playableAbilities.isEmpty()) {
return null; return null;
} }
if (playableAbilities.size() == 1 && !playableAbilities.get(0).promptIfOnlyPossibleAbility()) { if (abilities.size() == 1) {
return playableAbilities.get(0); return abilities.get(0);
} }
return GuiChoose.oneOrNone("Choose ability to play", playableAbilities); return GuiChoose.oneOrNone("Choose ability to play", abilities);
} }
if (abilities.isEmpty()) { if (abilities.isEmpty()) {