From 9481e44ae22733c9361e1ae6a8c6d76bde2ed950 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 1 Oct 2012 08:25:46 +0200
Subject: [PATCH] Fixed card number of Search Warrant and fixed NPE of
 ExchangeControlTargetEffect (still some issues left)

---
 .../sets/returntoravnica/SearchWarrant.java    |  2 +-
 .../ExchangeControlTargetEffect.java           | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java b/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java
index a3da5f8ff98..b675e24ef3c 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java
@@ -45,7 +45,7 @@ import mage.target.TargetPlayer;
 public class SearchWarrant extends CardImpl<SearchWarrant> {
 
     public SearchWarrant(UUID ownerId) {
-        super(ownerId, 161, "Search Warrant", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{W}{U}");
+        super(ownerId, 193, "Search Warrant", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{W}{U}");
         this.expansionSetCode = "RTR";
 
         this.color.setBlue(true);
diff --git a/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java
index 59f1f3e7f07..39b10f3d8e1 100644
--- a/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java
@@ -114,26 +114,36 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl<ExchangeCo
 
     @Override
     public boolean apply(Game game, Ability source) {
+        int countChangeControl = 0;
         if (this.lockedControllers != null) {
             for (UUID permanentId : targetPointer.getTargets(game, source)) {
                 Permanent permanent = game.getPermanent(permanentId);
                 if (permanent != null) {
                     UUID controllerId = this.lockedControllers.get(permanent.getId());
                     if (controllerId != null) {
-                        permanent.changeControllerId(controllerId, game);
+                        if(permanent.changeControllerId(controllerId, game)) {
+                            ++countChangeControl; 
+                        }
                     }
                 }
             }
             if (withSource) {
                 Permanent permanent = game.getPermanent(source.getSourceId());
-                UUID controllerId = this.lockedControllers.get(permanent.getId());
-                if (controllerId != null) {
-                    permanent.changeControllerId(controllerId, game);
+                if (permanent != null) {
+                    UUID controllerId = this.lockedControllers.get(permanent.getId());
+                    if (controllerId != null) {
+                        if (permanent.changeControllerId(controllerId, game)) {
+                            ++countChangeControl;
+                        }
+                    }
                 }
             }
+        }
+        if (countChangeControl == 2) {
             return true;
         }
         return false;
+
     }
 
     @Override