From f3b771cb7dd56f59971a924c4e90d2bdf04c2c37 Mon Sep 17 00:00:00 2001
From: Bug Hunter <therealtoolkit@hotmail.com>
Date: Wed, 12 May 2021 14:47:32 +0000
Subject: [PATCH] Fix stateBasedAction_Saga

---
 forge-game/src/main/java/forge/game/GameAction.java  |  3 +--
 .../src/main/java/forge/game/zone/MagicStack.java    | 12 +++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index a67612d15ad..c433efd776d 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -1355,8 +1355,7 @@ public class GameAction {
         if (c.getCounters(CounterEnumType.LORE) < c.getFinalChapterNr()) {
             return false;
         }
-        if (!game.getStack().hasSimultaneousStackEntries() &&
-                !game.getStack().hasSourceOnStack(c, SpellAbilityPredicates.isChapter())) {
+        if (!game.getStack().hasSourceOnStack(c, SpellAbilityPredicates.isChapter())) {
             sacrifice(c, null, table);
             checkAgain = true;
         }
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 c468405828b..b1be6b2ff3e 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -172,8 +172,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
     }
 
     public final void clearFrozen() {
-        // TODO: frozen triggered abilities and undoable costs have nasty
-        // consequences
+        // TODO: frozen triggered abilities and undoable costs have nasty consequences
         frozen = false;
         frozenStack.clear();
     }
@@ -905,11 +904,14 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         }
         for (SpellAbilityStackInstance si : stack) {
             if (si.isTrigger() && si.getSourceCard().equals(source)) {
-                if (pred == null) {
+                if (pred == null || pred.apply(si.getSpellAbility(false))) {
                     return true;
                 }
-                SpellAbility sa = si.getSpellAbility(false);
-                if (pred.apply(sa)) {
+            }
+        }
+        for (SpellAbility sa : simultaneousStackEntryList) {
+            if (sa.isTrigger() && sa.getHostCard().equals(source)) {
+                if (pred == null || pred.apply(sa)) {
                     return true;
                 }
             }