From c7a75432ce85fe9d957ab1c09ec8976235f382a6 Mon Sep 17 00:00:00 2001 From: excessum Date: Sun, 29 Nov 2015 03:12:32 +0000 Subject: [PATCH] - Addendum to r30413 for cases where other effects are on the stack --- forge-ai/src/main/java/forge/ai/ability/PumpAi.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java index 392d31e5ebb..aa8cf2eb0fe 100644 --- a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java @@ -49,6 +49,7 @@ public class PumpAi extends PumpAiBase { final List keywords = sa.hasParam("KW") ? Arrays.asList(sa.getParam("KW").split(" & ")) : new ArrayList(); final String numDefense = sa.hasParam("NumDef") ? sa.getParam("NumDef") : ""; final String numAttack = sa.hasParam("NumAtt") ? sa.getParam("NumAtt") : ""; + final boolean isFight = sa.getParam("AILogic").equals("Fight") || sa.getParam("AILogic").equals("PowerDmg"); if (!ComputerUtilCost.checkLifeCost(ai, cost, sa.getHostCard(), 4, null)) { return false; @@ -114,7 +115,7 @@ public class PumpAi extends PumpAiBase { if (!sa.isCurse() && !SpellAbilityAi.isSorcerySpeed(sa)) { return false; } - } else if (!game.getStack().isEmpty() && !sa.isCurse()) { + } else if (!game.getStack().isEmpty() && !sa.isCurse() && !isFight) { return ComputerUtilCard.canPumpAgainstRemoval(ai, sa); }