From 2a00a4aa6a691a3c99eec1f8a5c98ce5cd0e104d Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sat, 27 Nov 2021 22:30:53 +0100 Subject: [PATCH] Fix adventure remembering SA --- .../forge/game/ability/effects/DelayedTriggerEffect.java | 6 +----- .../main/java/forge/game/ability/effects/EffectEffect.java | 2 +- .../forge/game/ability/effects/ImmediateTriggerEffect.java | 6 +----- .../forge/game/staticability/StaticAbilityContinuous.java | 6 +----- 4 files changed, 4 insertions(+), 16 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 8c47f586c53..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,11 +56,7 @@ public class DelayedTriggerEffect extends SpellAbilityEffect { if (sa.hasParam("RememberObjects")) { for (final String rem : sa.getParam("RememberObjects").split(",")) { - for (final Object o : AbilityUtils.getDefinedObjects(sa.getHostCard(), rem, sa)) { - if (o instanceof SpellAbility) { - // "RememberObjects$ Remembered" don't remember spellability - continue; - } + 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/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java index fe82dc1738c..1fb6c9616a3 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java @@ -81,7 +81,7 @@ public class EffectEffect extends SpellAbilityEffect { if (sa.hasParam("RememberObjects")) { rememberList = new FCollection<>(); for (final String rem : sa.getParam("RememberObjects").split(",")) { - rememberList.addAll(AbilityUtils.getDefinedObjects(hostCard, rem, sa)); + rememberList.addAll(AbilityUtils.getDefinedEntities(hostCard, rem, sa)); } if (sa.hasParam("ForgetCounter")) { 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 fa8ba61e5ad..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,11 +59,7 @@ public class ImmediateTriggerEffect extends SpellAbilityEffect { if (sa.hasParam("RememberObjects")) { for (final String rem : sa.getParam("RememberObjects").split(",")) { - for (final Object o : AbilityUtils.getDefinedObjects(sa.getHostCard(), rem, sa)) { - if (o instanceof SpellAbility) { - // "RememberObjects$ Remembered" don't remember spellability - continue; - } + for (final Object o : AbilityUtils.getDefinedEntities(sa.getHostCard(), rem, sa)) { immediateTrig.addRemembered(o); } } diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java index af3e7614277..01bb427e29e 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java @@ -855,11 +855,7 @@ public final class StaticAbilityContinuous { if (params.containsKey("TriggerRememberDefined")) { String triggerRemembered = (params.get("TriggerRememberDefined")); for (final String rem : triggerRemembered.split(",")) { - for (final Object o : AbilityUtils.getDefinedObjects(hostCard, rem, stAb)) { - if (o instanceof SpellAbility) { - // "RememberObjects$ Remembered" don't remember spellability - continue; - } + for (final Object o : AbilityUtils.getDefinedEntities(hostCard, rem, stAb)) { actualTrigger.addRemembered(o); } }