From 974e0879b0f95350bc7ed0f016dd9552a3e707cc Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Fri, 6 Aug 2021 19:52:15 -0400
Subject: [PATCH] GameAction - allow some SAs to check states if specified

---
 forge-game/src/main/java/forge/game/GameAction.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 61159befd7c..40bedc7b398 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import forge.game.spellability.SpellAbilityStackInstance;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
 import com.google.common.base.Predicate;
@@ -1157,7 +1158,11 @@ public class GameAction {
         // sol(10/29) added for Phase updates, state effects shouldn't be
         // checked during Spell Resolution (except when persist-returning
         if (game.getStack().isResolving()) {
-            return;
+            Iterator<SpellAbilityStackInstance> it = game.getStack().iterator();
+            SpellAbility top = it.next().getSpellAbility(true);
+            if (!top.hasParam("CheckStates") && !top.getSubAbility().hasParam("CheckStates")) {
+                return;
+            }
         }
 
         if (game.isGameOver()) {