From a8205192caa28633c10781d2d85c6a45a1b27545 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 23 Jul 2021 10:44:34 -0400 Subject: [PATCH] remove Remember functions from DamageAllEffect --- .../game/ability/effects/DamageAllEffect.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java index 9d2cb2c41e4..554dc10b6d1 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java @@ -61,9 +61,7 @@ public class DamageAllEffect extends DamageBaseEffect { final String damage = sa.getParam("NumDmg"); final int dmg = AbilityUtils.calculateAmount(source, damage, sa); - final boolean rememberCard = sa.hasParam("RememberDamaged") || sa.hasParam("RememberDamagedCreature"); - final boolean rememberPlayer = sa.hasParam("RememberDamaged") || sa.hasParam("RememberDamagedPlayer"); - + //Remember params from this effect have been moved to dealDamage in GameAction Player targetPlayer = sa.getTargets().getFirstTargetedPlayer(); String players = ""; @@ -114,17 +112,6 @@ public class DamageAllEffect extends DamageBaseEffect { game.getAction().dealDamage(false, damageMap, preventMap, counterTable, sa); } - // do Remember there - if (rememberCard || rememberPlayer) { - for (GameEntity e : damageMap.row(sourceLKI).keySet()) { - if (e instanceof Card && rememberCard) { - source.addRemembered(e); - } else if (e instanceof Player && rememberPlayer) { - source.addRemembered(e); - } - } - } - replaceDying(sa); } }