From 9e3c51fb0dc261e8658c8503f0081ccd8f0c720c Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 18 May 2017 05:36:22 +0000 Subject: [PATCH] - FIXME: Temporarily reverting the way damageIfUnblocked queries damage prevention effects (since isCombatDamagePrevented doesn't work as desired and I can't figure out why). Feel free to revert this to continue working on isCombatDamagePrevented. --- forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java index f97f3e5d3b1..86940618f5e 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java @@ -190,8 +190,12 @@ public class ComputerUtilCombat { } if (!attacked.getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.noPrevention)) { - // ask ReplacementDamage directly - if (ComputerUtilCombat.isCombatDamagePrevented(attacker, attacked, damage)) { + // ask ReplacementDamage directly -- FIXME: this actually doesn't work right now, so it's temporarily reverted to the old form (see below). + //if (ComputerUtilCombat.isCombatDamagePrevented(attacker, attacked, damage)) { + if (attacker.hasKeyword("Prevent all damage that would be dealt by CARDNAME.") + || attacker.hasKeyword("Prevent all damage that would be dealt to and by CARDNAME.") + || attacker.hasKeyword("Prevent all combat damage that would be dealt by CARDNAME.") + || attacker.hasKeyword("Prevent all combat damage that would be dealt to and dealt by CARDNAME.")) { return 0; } }