diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java index a3dd3f3fa93..fd97b6d6f9f 100644 --- a/forge-game/src/main/java/forge/game/trigger/Trigger.java +++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java @@ -37,6 +37,7 @@ import java.util.*; import com.google.common.collect.Lists; import com.google.common.collect.Maps; + import forge.util.TextUtil; /** @@ -334,7 +335,22 @@ public abstract class Trigger extends TriggerReplacementBase { return false; } } - + + if (this.mapParams.containsKey("TriggerRememberedInZone")) { + // check delayed trigger remembered objects (Mnemonic Betrayal) + // make this check more general if possible + boolean bFlag = true; + for (Object o : getTriggerRemembered()) { + if (o instanceof Card && ((Card) o).isInZone(ZoneType.smartValueOf(this.mapParams.get("TriggerRememberedInZone")))) { + bFlag = false; + break; + } + } + if (bFlag) { + return false; + } + } + if ( !meetsCommonRequirements(this.mapParams)) return false; diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java index 00c3536e15e..07b6a67caae 100644 --- a/forge-game/src/main/java/forge/game/zone/MagicStack.java +++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java @@ -366,7 +366,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable