From cdc1f6014e6bf962fe8502c2823c36455fe4ee1c Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Fri, 23 Apr 2021 21:25:58 +0200
Subject: [PATCH] also filter simultaneousStackEntryList

---
 .../src/main/java/forge/game/zone/MagicStack.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 18db18e90c2..c468405828b 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -718,6 +718,18 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
                 remove(si);
             }
         }
+        for (SpellAbility sa : Lists.newArrayList(simultaneousStackEntryList)) {
+            Player activator = sa.getActivatingPlayer();
+            if (activator == null) {
+                if (sa.getHostCard().getController().equals(p)) {
+                    simultaneousStackEntryList.remove(sa);
+                }
+            } else {
+                if (activator.equals(p)) {
+                    simultaneousStackEntryList.remove(sa);
+                }
+            }
+        }
     }
 
     public void fizzleTriggersOnStackTargeting(Card c, TriggerType t) {