From 2b59a6faae8d4db9dbb64a455b3b10aa2551291c Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 30 May 2014 20:24:00 +0200 Subject: [PATCH] Ability picker is shown now for only one ability if preference setting is on and ability has no mana costs or is no play land ability. --- .../src/mage/player/human/HumanPlayer.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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 2b258a1b40..f6212edd12 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 @@ -48,6 +48,7 @@ import mage.abilities.TriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.VariableCost; import mage.abilities.costs.common.PayLifeCost; +import mage.abilities.costs.common.RemoveCounterCost; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCost; @@ -877,14 +878,8 @@ public class HumanPlayer extends PlayerImpl { if (ability instanceof ManaAbility) { return true; } - for(Cost cost : ability.getCosts() ) { - if (!(cost instanceof TapSourceCost) && !(cost instanceof PayLifeCost)) { - // if cost exists that have to be paid, pick ability dialog can be suppressed - return true; - } - } - return false; - + // if ability has no mana costs you have to pick it from ability picker + return !ability.getManaCostsToPay().isEmpty(); } return true; }