From 802414764d8123f7a8ca10294c892bf01a63f9ef Mon Sep 17 00:00:00 2001
From: spjspj <spjspj4@gmail.com>
Date: Sun, 19 Jun 2016 01:45:18 +1000
Subject: [PATCH] spjspj - Some fixes for Synod Sanctum (ARC)

---
 .../src/mage/sets/archenemy/SynodSanctum.java      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/archenemy/SynodSanctum.java b/Mage.Sets/src/mage/sets/archenemy/SynodSanctum.java
index e11c727e04b..3c03d92e527 100644
--- a/Mage.Sets/src/mage/sets/archenemy/SynodSanctum.java
+++ b/Mage.Sets/src/mage/sets/archenemy/SynodSanctum.java
@@ -50,6 +50,7 @@ import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.Target;
 import mage.target.TargetPermanent;
+import mage.util.CardUtil;
 
 /**
  *
@@ -111,7 +112,8 @@ class SynodSanctumEffect extends OneShotEffect {
             if (getTargetPointer().getFirst(game, source) != null) {
                 Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
                 if (permanent != null) {
-                    if (controller.moveCardToExileWithInfo(permanent, source.getSourceId(), sourceObject.getIdName(), source.getSourceId(), game, Zone.BATTLEFIELD, true)) {
+                    UUID exileZone = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter());
+                    if (exileZone != null && controller.moveCardToExileWithInfo(permanent, exileZone, sourceObject.getIdName(), source.getId(), game, Zone.BATTLEFIELD, true)) {
                         return true;
                     }
                 }
@@ -139,7 +141,15 @@ class SynodSanctumEffect2 extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        ExileZone exile = game.getExile().getExileZone(source.getSourceId());
+        UUID exileId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter());
+        if (exileId == null) {
+            return false;
+        }
+        ExileZone exile = game.getExile().getExileZone(exileId);
+        if (exile == null) {
+            return false;
+        }
+
         Player controller = game.getPlayer(source.getControllerId());
         MageObject sourceObject = game.getObject(source.getSourceId());
         boolean allReturned = true;