From a2b88911886b8fcef9e8a5b1277445cbbba85029 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 10 Jan 2017 23:54:42 +0100 Subject: [PATCH] Fixed a NPE of Meld effect. --- .../src/main/java/mage/abilities/effects/common/MeldEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java index 1c28325374e..8a09e379994 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java @@ -98,7 +98,7 @@ public class MeldEffect extends OneShotEffect { // Create the meld card and move it to the battlefield. Card sourceCard = game.getExile().getCard(sourceId, game); Card meldWithCard = game.getExile().getCard(meldWithId, game); - if (!sourceCard.isCopy() && !meldWithCard.isCopy()) { + if (sourceCard != null && !sourceCard.isCopy() && meldWithCard != null && !meldWithCard.isCopy()) { meldCard.setOwnerId(controller.getId()); meldCard.setTopHalfCard(meldWithCard, game); meldCard.setBottomHalfCard(sourceCard, game);