From 0d0d14856a9abb165a4c6094aa48530661d83848 Mon Sep 17 00:00:00 2001 From: Daniel Bomar Date: Mon, 8 Feb 2021 10:31:38 -0600 Subject: [PATCH] Fixed flicker effects not working with MDFCs (fixes #7516) --- .../ReturnToBattlefieldUnderYourControlTargetEffect.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java index 839a7ba304..c209ad2163 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java @@ -10,6 +10,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import mage.util.CardUtil; import java.util.UUID; @@ -76,8 +77,9 @@ public class ReturnToBattlefieldUnderYourControlTargetEffect extends OneShotEffe Cards cardsToBattlefield = new CardsImpl(); if (returnFromExileZoneOnly) { for (UUID targetId : this.getTargetPointer().getTargets(game, source)) { - if (game.getExile().containsId(targetId, game)) { - cardsToBattlefield.add(targetId); + UUID mainCardId = CardUtil.getMainCardId(game, targetId); + if (game.getExile().containsId(mainCardId, game)) { + cardsToBattlefield.add(mainCardId); } else { Card card = game.getCard(targetId); if (card instanceof MeldCard) {