external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

GameAction - allow some SAs to check states if specified

Browse Source
This commit is contained in:
Northmoc
2021-08-06 19:52:15 -04:00
parent dd89e0eb64
commit 974e0879b0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import forge.game.spellability.SpellAbilityStackInstance;
import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutablePair;
import com.google.common.base.Predicate; 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 // sol(10/29) added for Phase updates, state effects shouldn't be
// checked during Spell Resolution (except when persist-returning // checked during Spell Resolution (except when persist-returning
if (game.getStack().isResolving()) { 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()) { if (game.isGameOver()) {