From d1199e2698d01390514ffccebc6b64358a583721 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Fri, 8 May 2020 05:53:19 +0000 Subject: [PATCH] DamageDealEffect: fix removeDamage --- .../java/forge/game/ability/effects/DamageDealEffect.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java index 9aeeee88eee..6e848865bc6 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java @@ -237,9 +237,11 @@ public class DamageDealEffect extends DamageBaseEffect { } for (final Object o : tgts) { - dmg = (sa.usesTargeting() && sa.hasParam("DividedAsYouChoose")) ? sa.getTargetRestrictions().getDividedValue(o) : dmg; - if (dmg <= 0) { - continue; + if (!removeDamage) { + dmg = (sa.usesTargeting() && sa.hasParam("DividedAsYouChoose")) ? sa.getTargetRestrictions().getDividedValue(o) : dmg; + if (dmg <= 0) { + continue; + } } if (o instanceof Card) { final Card c = (Card) o;