From a63c15203863228bc0fb18091e5335b97514500b Mon Sep 17 00:00:00 2001 From: Hanmac Date: Mon, 7 Nov 2016 09:50:54 +0000 Subject: [PATCH] HumanCostDecision: CostRemoveCounter: add confirmPayment for it, when removing from host, but ignore pw abilities --- .../main/java/forge/player/HumanCostDecision.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index e0cbff6ecd6..34c3e62f2b3 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -954,6 +954,20 @@ public class HumanCostDecision extends CostDecisionMakerBase { } else if (c == null && "XChoice".equals(sVarAmount)) { cntRemoved = chooseXValue(maxCounters); + } else if (ability != null && !ability.getRestrictions().isPwAbility()) { + // ignore Planeswalker abilities for this + if (maxCounters < cntRemoved) { + return null; + } + + final StringBuilder sb = new StringBuilder("Remove "); + sb.append(Lang.nounWithNumeral(amount, cost.counter.getName() + " counter")); + sb.append(" from "); + sb.append(source.getName()); + sb.append("?"); + if (!player.getController().confirmPayment(cost, sb.toString())) { + return null; + } } if (maxCounters < cntRemoved) {