From 1f5aed848d8f390f304a6ef89a74ac9dadef4db7 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Fri, 20 Jul 2012 13:16:54 +0400
Subject: [PATCH] Exchange control effect: locking controllers. All tests pass
 now.

---
 .../ExchangeControlTargetEffect.java          | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java
index 972212518d9..486a3f7cf26 100644
--- a/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java
@@ -38,10 +38,7 @@ import mage.abilities.effects.ContinuousEffectImpl;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * @author magenoxx_at_googlemail.com
@@ -49,6 +46,7 @@ import java.util.UUID;
 public class ExchangeControlTargetEffect extends ContinuousEffectImpl<ExchangeControlTargetEffect> {
 
     private String rule;
+    private Map<UUID, UUID> lockedControllers;
 
     public ExchangeControlTargetEffect(Duration duration, String rule) {
         super(duration, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl);
@@ -66,7 +64,7 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl<ExchangeCo
     }
 
     @Override
-    public boolean apply(Game game, Ability source) {
+    public void init(Ability source, Game game) {
         Set<UUID> controllers = new HashSet<UUID>();
         for (UUID permanentId : targetPointer.getTargets(game, source)) {
             Permanent permanent = game.getPermanent(permanentId);
@@ -78,9 +76,11 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl<ExchangeCo
         if (controllers.size() != 2) {
             // discard effect
             this.discarded = true;
-            return false;
+            return;
         }
 
+        this.lockedControllers = new HashMap<UUID, UUID>();
+
         Iterator<UUID> it = controllers.iterator();
         UUID firstController = it.next();
         UUID secondController = it.next();
@@ -88,7 +88,20 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl<ExchangeCo
         for (UUID permanentId : targetPointer.getTargets(game, source)) {
             Permanent permanent = game.getPermanent(permanentId);
             if (permanent != null) {
-                permanent.changeControllerId(permanent.getControllerId().equals(firstController) ? secondController : firstController, game);
+                this.lockedControllers.put(permanent.getId(), permanent.getControllerId().equals(firstController) ? secondController : firstController);
+            }
+        }
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        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);
+                }
             }
         }