From d6be871b1e47172626763fb2dfdf34cf6d372be7 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 26 Nov 2024 08:37:11 -0500 Subject: [PATCH 1/2] take3 --- forge-game/src/main/java/forge/game/ability/AbilityUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index d0e727a2bed..0477fcdffa6 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -3004,7 +3004,7 @@ public static final List getSpellsFromPlayEffect(final Card tgtCar sp.setCardState(original); list.add(sp); } - if (tgtCard.isModal()) { + if (tgtCard.isModal() && tgtCard.getState(CardStateName.Modal) != null) { collectSpellsForPlayEffect(list, tgtCard.getState(CardStateName.Modal), controller, withAltCost); } } From 5dfd13ebdd7f4d4c094e79ec292f432575e47928 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 26 Nov 2024 18:34:00 -0500 Subject: [PATCH 2/2] tweak --- forge-game/src/main/java/forge/game/ability/AbilityUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index 0477fcdffa6..2b44c4b720a 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -3004,7 +3004,7 @@ public static final List getSpellsFromPlayEffect(final Card tgtCar sp.setCardState(original); list.add(sp); } - if (tgtCard.isModal() && tgtCard.getState(CardStateName.Modal) != null) { + if (tgtCard.isModal() && tgtCard.hasState(CardStateName.Modal)) { collectSpellsForPlayEffect(list, tgtCard.getState(CardStateName.Modal), controller, withAltCost); } }