diff --git a/Mage/src/main/java/mage/cards/Card.java b/Mage/src/main/java/mage/cards/Card.java index c8547e513a6..21776e6be3a 100644 --- a/Mage/src/main/java/mage/cards/Card.java +++ b/Mage/src/main/java/mage/cards/Card.java @@ -82,7 +82,7 @@ public interface Card extends MageObject, Ownerable { return null; } - default Card getMeldsToCard() { + default MeldCard getMeldsToCard() { return null; } diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index 78312b770fc..27d65fe059f 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -46,7 +46,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card { protected Class secondSideCardClazz; protected Class meldsWithClazz; protected Class meldsToClazz; - protected Card meldsToCard; + protected MeldCard meldsToCard; protected Card secondSideCard; protected boolean nightCard; protected SpellAbility spellAbility; @@ -708,14 +708,14 @@ public abstract class CardImpl extends MageObjectImpl implements Card { } @Override - public Card getMeldsToCard() { + public MeldCard getMeldsToCard() { // init card on first call if (meldsToClazz == null && meldsToCard == null) { return null; } if (meldsToCard == null) { - meldsToCard = initSecondSideCard(meldsToClazz); + meldsToCard = (MeldCard) initSecondSideCard(meldsToClazz); } return meldsToCard;