From 9f470e2bd03ad28035e6f291bfc92fcd84e34af0 Mon Sep 17 00:00:00 2001
From: Kevin Shin <kevinwshin@utexas.edu>
Date: Thu, 23 Aug 2018 02:55:47 -0500
Subject: [PATCH] Fixes Flickerform to return the exiled creature under the
 creature's owner's control, instead of its own owner's control. #5084

---
 Mage.Sets/src/mage/cards/f/Flickerform.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Mage.Sets/src/mage/cards/f/Flickerform.java b/Mage.Sets/src/mage/cards/f/Flickerform.java
index 550ae27ce61..b7aabe64753 100644
--- a/Mage.Sets/src/mage/cards/f/Flickerform.java
+++ b/Mage.Sets/src/mage/cards/f/Flickerform.java
@@ -156,8 +156,9 @@ class FlickerformReturnEffect extends OneShotEffect {
         }
         ExileZone exileZone = game.getExile().getExileZone(exileZoneId);
         Card enchantedCard = exileZone.get(enchantedCardId, game);
+        Player owner = game.getPlayer(enchantedCard.getOwnerId());
         if (enchantedCard != null) {
-            controller.moveCards(enchantedCard, Zone.BATTLEFIELD, source, game);
+            owner.moveCards(enchantedCard, Zone.BATTLEFIELD, source, game);
             Permanent newPermanent = game.getPermanent(enchantedCardId);
             if (newPermanent != null) {
                 Set<Card> toBattlefieldAttached = new HashSet<Card>();