From d3b8a2cc0ebc49b0dd86d699ab305a66cf4c58ce Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 29 May 2019 14:24:01 +0300 Subject: [PATCH] - Fix Remove Any Counter for the AI --- forge-ai/src/main/java/forge/ai/ComputerUtilCost.java | 9 +++++++++ forge-ai/src/main/java/forge/ai/ability/DrawAi.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java index 4afe5174eb8..fcd1f648a49 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java @@ -110,6 +110,15 @@ public class ComputerUtilCost { && !source.hasKeyword(Keyword.UNDYING)) { return false; } + } else if (part instanceof CostRemoveAnyCounter) { + if (sa != null) { + final CostRemoveAnyCounter remCounter = (CostRemoveAnyCounter) part; + + PaymentDecision decision = new AiCostDecision(sa.getActivatingPlayer(), sa).visit(remCounter); + return decision != null; + } + + return false; } } return true; diff --git a/forge-ai/src/main/java/forge/ai/ability/DrawAi.java b/forge-ai/src/main/java/forge/ai/ability/DrawAi.java index 2d286dbddd8..094ebe558a1 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DrawAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DrawAi.java @@ -107,7 +107,7 @@ public class DrawAi extends SpellAbilityAi { } } - if (!ComputerUtilCost.checkRemoveCounterCost(cost, source)) { + if (!ComputerUtilCost.checkRemoveCounterCost(cost, source, sa)) { return false; }