From 4fb84a104546b2c161f00c78da64ed79ced9b14b Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Thu, 14 Jul 2022 22:16:11 +0200
Subject: [PATCH] Fix multiple state trigger

---
 .../java/forge/game/ability/effects/AnimateEffect.java |  2 --
 .../src/main/java/forge/game/zone/MagicStack.java      | 10 +++++++++-
 forge-gui/res/cardsfolder/b/boreal_outrider.txt        |  2 +-
 forge-gui/res/cardsfolder/o/olivia_crimson_bride.txt   |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
index 5f066d9df5a..91bc885e70c 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
@@ -154,8 +154,6 @@ public class AnimateEffect extends AnimateEffectBase {
             }
         }
 
-
-
         List<Card> tgts = getCardsfromTargets(sa);
 
         if (sa.hasParam("Optional")) {
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 4fc81955212..45112a2b2cf 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -71,6 +71,7 @@ import forge.util.TextUtil;
  */
 public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbilityStackInstance> {
     private final List<SpellAbility> simultaneousStackEntryList = Lists.newArrayList();
+    private final List<SpellAbility> activePlayerSAs = Lists.newArrayList();
 
     // They don't provide a LIFO queue, so had to use a deque
     private final Deque<SpellAbilityStackInstance> stack = new LinkedBlockingDeque<>();
@@ -824,7 +825,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             return false;
         }
 
-        final List<SpellAbility> activePlayerSAs = Lists.newArrayList();
+        activePlayerSAs.clear();
         for (int i = 0; i < simultaneousStackEntryList.size(); i++) {
             SpellAbility sa = simultaneousStackEntryList.get(i);
             Player activator = sa.getActivatingPlayer();
@@ -843,6 +844,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         }
 
         activePlayer.getController().orderAndPlaySimultaneousSa(activePlayerSAs);
+        activePlayerSAs.clear();
         return true;
     }
 
@@ -864,6 +866,12 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
                 return true;
             }
         }
+
+        for (final SpellAbility sa : activePlayerSAs) {
+            if (sa.getSourceTrigger() == triggerID) {
+                return true;
+            }
+        }
         return false;
     }
 
diff --git a/forge-gui/res/cardsfolder/b/boreal_outrider.txt b/forge-gui/res/cardsfolder/b/boreal_outrider.txt
index 21b4c26cc2f..8e5f58d2fb3 100644
--- a/forge-gui/res/cardsfolder/b/boreal_outrider.txt
+++ b/forge-gui/res/cardsfolder/b/boreal_outrider.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Snow Creature Elf Warrior
 PT:3/2
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | SnowSpentForCardsColor$ True | TriggerDescription$ Whenever you cast a creature spell, if {S} of any of that spell's colors was spent to cast it, that creature enters the battlefield with an additional +1/+1 counter on it. ({S} is mana from a snow source.)
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | ReplacementEffects$ ETBCreat
+SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | ReplacementEffects$ ETBCreat | ExileOnMoved$ Stack
 SVar:ETBCreat:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ DBPutP1P1 | ReplacementResult$ Updated | Description$ That creature enters the battlefield with an additional +1/+1 counter on it.
 SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 1 | SubAbility$ DBExile
 SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
diff --git a/forge-gui/res/cardsfolder/o/olivia_crimson_bride.txt b/forge-gui/res/cardsfolder/o/olivia_crimson_bride.txt
index 92af7a3a0a8..d3d21e4db38 100644
--- a/forge-gui/res/cardsfolder/o/olivia_crimson_bride.txt
+++ b/forge-gui/res/cardsfolder/o/olivia_crimson_bride.txt
@@ -5,7 +5,7 @@ PT:3/4
 K:Flying
 K:Haste
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, return target creature card from your graveyard to the battlefield tapped and attacking. It gains "When you don't control a legendary Vampire, exile this creature."
-SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | Tapped$ True | Attacking$ True | RememberChanged$ True | AnimateSubAbility$ DBAnimate
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | Tapped$ True | Attacking$ True | AnimateSubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Duration$ Permanent | Triggers$ TrigOlivia
 SVar:TrigOlivia:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Vampire.YouCtrl+Legendary | PresentCompare$ EQ0 | Execute$ TrigExile | TriggerDescription$ When you don't control a legendary Vampire, exile this creature.
 SVar:TrigExile:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile