From 055cd40fb1fbd6c0b6abee74041fb5ad6528c78c Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Thu, 4 Sep 2025 21:16:46 +0200
Subject: [PATCH] Fix special actions going through frozen stack (#8642)

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

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 0c46feb7d77..2ef9d3cddb8 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -331,6 +331,12 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             }
         }
 
+        if (sp instanceof AbilityStatic || (sp.isTrigger() && sp.getTrigger().getOverridingAbility() instanceof AbilityStatic)) {
+            AbilityUtils.resolve(sp);
+            // AbilityStatic should do nothing below
+            return;
+        }
+
         if (si == null && sp.isActivatedAbility() && !sp.isCopied()) {
             // if not already copied use a fresh instance
             SpellAbility original = sp;
@@ -354,12 +360,6 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             addAbilityActivatedThisTurn(sp, source);
         }
 
-        if (sp instanceof AbilityStatic || (sp.isTrigger() && sp.getTrigger().getOverridingAbility() instanceof AbilityStatic)) {
-            AbilityUtils.resolve(sp);
-            // AbilityStatic should do nothing below
-            return;
-        }
-
         // The ability is added to stack HERE
         si = push(sp, si, id);