- 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.

This commit is contained in:
Agetian
2017-05-18 05:36:22 +00:00
parent d42bf8eac7
commit 9e3c51fb0d

View File

@@ -190,8 +190,12 @@ public class ComputerUtilCombat {
} }
if (!attacked.getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.noPrevention)) { if (!attacked.getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.noPrevention)) {
// ask ReplacementDamage directly // 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 (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; return 0;
} }
} }