From 61add5ab5bc7a03e0a2a02a6d2bc1b22e8995bde Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 25 Apr 2014 19:27:08 +0200
Subject: [PATCH] Fixed ReturnFromExileEffect, some formatting.

---
 .../mage/sets/innistrad/LaboratoryManiac.java | 10 ++---
 .../journeyintonyx/PropheticFlamespeaker.java |  2 +-
 .../effects/common/ReturnFromExileEffect.java | 37 ++++++++++---------
 .../mage/cards/repository/CardRepository.java |  2 +-
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java b/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java
index be25089c9f5..165b92dbc3a 100644
--- a/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java
+++ b/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java
@@ -28,16 +28,16 @@
 package mage.sets.innistrad;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Outcome;
-import mage.constants.Rarity;
-import mage.constants.Zone;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.events.GameEvent;
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java b/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java
index 92306615e62..fa318cc8a73 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/PropheticFlamespeaker.java
@@ -151,7 +151,7 @@ class PropheticFlamespeakerCastFromExileEffect extends AsThoughEffectImpl<Prophe
                 Player player = game.getPlayer(source.getControllerId());
                 if (player != null ) {
                     if (card.getCardType().contains(CardType.LAND)) {
-                        // If the revealed card is a land, you can play it only if it's your turn and you haven't yet played a land this turn.
+                        // If the revealed card is a land, you can play it only if it's your turn and you can play still a land this turn.
                         if (player.canPlayLand() 
                                 && game.getActivePlayerId().equals(player.getId())
                                 && game.getStack().isEmpty() 
diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java b/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java
index f8c3f3b284d..9c0c1fefd3d 100644
--- a/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java
@@ -88,24 +88,27 @@ public class ReturnFromExileEffect extends OneShotEffect<ReturnFromExileEffect>
             exile = exile.copy();
             for (UUID cardId: exile) {
                 Card card = game.getCard(cardId);
-                switch (zone) {
-                    case BATTLEFIELD:
-                        controller.putOntoBattlefieldWithInfo(card, game, Zone.EXILED,  source.getSourceId(), tapped);
-                        break;
-                    case HAND:
-                        controller.moveCardToHandWithInfo(card, source.getSourceId(), game, Zone.EXILED);
-                        break;
-                    case GRAVEYARD:
-                        controller.moveCardToGraveyardWithInfo(card, source.getSourceId(), game, Zone.EXILED);
-                        break;
-                    case LIBRARY:
-                        controller.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.EXILED, true);
-                        break;
-                    default:
-                        card.moveToZone(zone, source.getSourceId(), game, tapped);
-                        game.informPlayers(new StringBuilder(controller.getName()).append(" moves ").append(card.getName()).append(" to ").append(zone.toString()).toString());
+                Player owner = game.getPlayer(card.getOwnerId());
+                if (owner != null) {
+                    switch (zone) {
+                        case BATTLEFIELD:
+                            card.moveToZone(zone, source.getSourceId(), game, tapped);
+                            game.informPlayers(new StringBuilder(controller.getName()).append(" moves ").append(card.getName()).append(" to ").append(zone.toString()).toString());
+                            break;
+                        case HAND:
+                            controller.moveCardToHandWithInfo(card, source.getSourceId(), game, Zone.EXILED);
+                            break;
+                        case GRAVEYARD:
+                            controller.moveCardToGraveyardWithInfo(card, source.getSourceId(), game, Zone.EXILED);
+                            break;
+                        case LIBRARY:
+                            controller.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.EXILED, true);
+                            break;
+                        default:
+                            card.moveToZone(zone, source.getSourceId(), game, tapped);
+                            game.informPlayers(new StringBuilder(controller.getName()).append(" moves ").append(card.getName()).append(" to ").append(zone.toString()).toString());
+                    }
                 }
-                
             }
             game.getExile().getExileZone(exileId).clear();
             return true;
diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/mage/cards/repository/CardRepository.java
index 5cc791573f8..cb8bad16b91 100644
--- a/Mage/src/mage/cards/repository/CardRepository.java
+++ b/Mage/src/mage/cards/repository/CardRepository.java
@@ -52,7 +52,7 @@ public enum CardRepository {
 
     private static final String JDBC_URL = "jdbc:sqlite:db/cards.db";
     private static final String VERSION_ENTITY_NAME = "card";
-    private static final long CARD_DB_VERSION = 29;
+    private static final long CARD_DB_VERSION = 30;
 
     private final Random random = new Random();
     private Dao<CardInfo, Object> cardDao;