From eec4f0ac7ef710bbb78009756469d1df863c3a16 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Fri, 13 Jun 2025 23:52:59 +0400
Subject: [PATCH] merge fix

---
 .../main/java/mage/cards/CardWithSpellOption.java   |  1 +
 .../main/java/mage/cards/ModalDoubleFacedCard.java  | 13 +++++--------
 Mage/src/main/java/mage/cards/SplitCard.java        | 13 +++++--------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/Mage/src/main/java/mage/cards/CardWithSpellOption.java b/Mage/src/main/java/mage/cards/CardWithSpellOption.java
index b1470f7dedc..ed177daa1ec 100644
--- a/Mage/src/main/java/mage/cards/CardWithSpellOption.java
+++ b/Mage/src/main/java/mage/cards/CardWithSpellOption.java
@@ -26,6 +26,7 @@ public abstract class CardWithSpellOption extends CardImpl {
 
     public CardWithSpellOption(CardWithSpellOption card) {
         super(card);
+        // make sure all parts created and parent ref added
         this.spellCard = card.getSpellCard().copy();
         this.spellCard.setParentCard(this);
     }
diff --git a/Mage/src/main/java/mage/cards/ModalDoubleFacedCard.java b/Mage/src/main/java/mage/cards/ModalDoubleFacedCard.java
index 4fb14b98485..eccfab302f2 100644
--- a/Mage/src/main/java/mage/cards/ModalDoubleFacedCard.java
+++ b/Mage/src/main/java/mage/cards/ModalDoubleFacedCard.java
@@ -62,14 +62,11 @@ public abstract class ModalDoubleFacedCard extends CardImpl implements CardWithH
 
     public ModalDoubleFacedCard(ModalDoubleFacedCard card) {
         super(card);
-        if (card.leftHalfCard != null) {
-            this.leftHalfCard = card.leftHalfCard.copy();
-            ((ModalDoubleFacedCardHalf) this.leftHalfCard).setParentCard(this);
-        }
-        if (card.rightHalfCard != null) {
-            this.rightHalfCard = card.rightHalfCard.copy();
-            ((ModalDoubleFacedCardHalf) this.rightHalfCard).setParentCard(this);
-        }
+        // make sure all parts created and parent ref added
+        this.leftHalfCard = card.getLeftHalfCard().copy();
+        ((ModalDoubleFacedCardHalf) leftHalfCard).setParentCard(this);
+        this.rightHalfCard = card.rightHalfCard.copy();
+        ((ModalDoubleFacedCardHalf) rightHalfCard).setParentCard(this);
     }
 
     public ModalDoubleFacedCardHalf getLeftHalfCard() {
diff --git a/Mage/src/main/java/mage/cards/SplitCard.java b/Mage/src/main/java/mage/cards/SplitCard.java
index cf415ba750b..7595febd85b 100644
--- a/Mage/src/main/java/mage/cards/SplitCard.java
+++ b/Mage/src/main/java/mage/cards/SplitCard.java
@@ -38,14 +38,11 @@ public abstract class SplitCard extends CardImpl implements CardWithHalves {
 
     protected SplitCard(SplitCard card) {
         super(card);
-        if (card.leftHalfCard != null) {
-            this.leftHalfCard = card.leftHalfCard.copy();
-            ((SplitCardHalf) this.leftHalfCard).setParentCard(this);
-        }
-        if (card.rightHalfCard != null) {
-            this.rightHalfCard = card.rightHalfCard.copy();
-            ((SplitCardHalf) this.rightHalfCard).setParentCard(this);
-        }
+        // make sure all parts created and parent ref added
+        this.leftHalfCard = card.getLeftHalfCard().copy();
+        ((SplitCardHalf) leftHalfCard).setParentCard(this);
+        this.rightHalfCard = card.rightHalfCard.copy();
+        ((SplitCardHalf) rightHalfCard).setParentCard(this);
     }
 
     public void setParts(SplitCardHalf leftHalfCard, SplitCardHalf rightHalfCard) {