fix Magar modal crash

Card-Forge · Nov 24, 2024 · 42bc796 · 42bc796
1 parent 4d21db9
commit 42bc796
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -3010,6 +3010,7 @@ public static final List<SpellAbility> getSpellsFromPlayEffect(final Card tgtCar
         }
 
         for (SpellAbility s : list) {
+            if (s == null) continue;
             if (s.isLandAbility()) {
                 s.setActivatingPlayer(controller);
                 // CR 305.3

diff --git a/forge-game/src/main/java/forge/game/card/CardCopyService.java b/forge-game/src/main/java/forge/game/card/CardCopyService.java
@@ -252,6 +252,10 @@ public Card getLKICopy(Map<Integer, Card> cachedMap) {
             newCopy.getState(CardStateName.Original).copyFrom(copyFrom.getState(CardStateName.Original), true);
             newCopy.addAlternateState(CardStateName.Transformed, false);
             newCopy.getState(CardStateName.Transformed).copyFrom(copyFrom.getState(CardStateName.Transformed), true);
+        } else if (copyFrom.isModal()) {
+            newCopy.getState(CardStateName.Original).copyFrom(copyFrom.getState(CardStateName.Original), true);
+            newCopy.addAlternateState(CardStateName.Modal, false);
+            newCopy.getState(CardStateName.Modal).copyFrom(copyFrom.getState(CardStateName.Modal), true);
         } else if (copyFrom.isAdventureCard()) {
             newCopy.getState(CardStateName.Original).copyFrom(copyFrom.getState(CardStateName.Original), true);
             newCopy.addAlternateState(CardStateName.Adventure, false);