diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index b0a62990da8..99fdd382d11 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -2196,6 +2196,20 @@ public class GameAction { } } + // Remember objects as needed + final Card sourceLKI = cause.getHostCard().getGame().getChangeZoneLKIInfo(cause.getHostCard()); + final boolean rememberCard = cause.hasParam("RememberDamaged") || cause.hasParam("RememberDamagedCreature"); + final boolean rememberPlayer = cause.hasParam("RememberDamaged") || cause.hasParam("RememberDamagedPlayer"); + if (rememberCard || rememberPlayer) { + for (GameEntity e : damageMap.row(sourceLKI).keySet()) { + if (e instanceof Card && rememberCard) { + cause.getHostCard().addRemembered(e); + } else if (e instanceof Player && rememberPlayer) { + cause.getHostCard().addRemembered(e); + } + } + } + preventMap.triggerPreventDamage(isCombat); preventMap.clear();