From 40e50cd61286d458b7b28dd5fd5d3be5eb73ac89 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 17 Dec 2021 22:00:13 +0100 Subject: [PATCH] Fix trigger remembering --- .../java/forge/game/ability/effects/DelayedTriggerEffect.java | 4 +++- .../forge/game/ability/effects/ImmediateTriggerEffect.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java index 6592c4d2283..9adec6a686e 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java @@ -56,7 +56,9 @@ public class DelayedTriggerEffect extends SpellAbilityEffect { if (sa.hasParam("RememberObjects")) { for (final String rem : sa.getParam("RememberObjects").split(",")) { - delTrig.addRemembered(AbilityUtils.getDefinedEntities(sa.getHostCard(), rem, sa)); + for (final Object o : AbilityUtils.getDefinedEntities(sa.getHostCard(), rem, sa)) { + delTrig.addRemembered(o); + } } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java index 568e49c9b6c..d2410394a6a 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java @@ -59,7 +59,9 @@ public class ImmediateTriggerEffect extends SpellAbilityEffect { if (sa.hasParam("RememberObjects")) { for (final String rem : sa.getParam("RememberObjects").split(",")) { - immediateTrig.addRemembered(AbilityUtils.getDefinedEntities(sa.getHostCard(), rem, sa)); + for (final Object o : AbilityUtils.getDefinedEntities(sa.getHostCard(), rem, sa)) { + immediateTrig.addRemembered(o); + } } }