From d6d07c3f9e73e1ae24617ba468ed4dbf7be622e2 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 30 Sep 2012 09:46:21 +0200
Subject: [PATCH] Small fixes to ExchangeControlTargetEffect, GlintHawk and
 SavingGrasp

---
 .../src/mage/sets/darkascension/SavingGrasp.java    | 13 +++++++++++--
 .../src/mage/sets/scarsofmirrodin/GlintHawk.java    |  2 +-
 .../continious/ExchangeControlTargetEffect.java     |  6 +++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java b/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java
index 112efdc18a..22f6ba326f 100644
--- a/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java
+++ b/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java
@@ -28,6 +28,7 @@
 package mage.sets.darkascension;
 
 import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.Constants.TimingRule;
@@ -35,7 +36,9 @@ import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.abilities.keyword.FlashbackAbility;
 import mage.cards.CardImpl;
-import mage.target.common.TargetControlledCreaturePermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.other.OwnerPredicate;
+import mage.target.common.TargetCreaturePermanent;
 
 /**
  *
@@ -43,6 +46,12 @@ import mage.target.common.TargetControlledCreaturePermanent;
  */
 public class SavingGrasp extends CardImpl<SavingGrasp> {
 
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you own");
+
+    static {
+        filter.add(new OwnerPredicate(Constants.TargetController.YOU));
+    }
+
     public SavingGrasp(UUID ownerId) {
         super(ownerId, 46, "Saving Grasp", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}");
         this.expansionSetCode = "DKA";
@@ -50,7 +59,7 @@ public class SavingGrasp extends CardImpl<SavingGrasp> {
         this.color.setBlue(true);
 
         // Return target creature you own to your hand.
-        this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
         // Flashback {W}
         this.addAbility(new FlashbackAbility(new ManaCostsImpl("{W}"), TimingRule.INSTANT));
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java
index 1b48fd47c2..dcc04217ac 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlintHawk.java
@@ -78,7 +78,7 @@ public class GlintHawk extends CardImpl<GlintHawk> {
 class GlintHawkEffect extends OneShotEffect<GlintHawkEffect> {
 
     private static final FilterControlledPermanent filter;
-    private static final String effectText = "When {this} enters the battlefield, sacrifice it unless you return an artifact you control to its owner's hand";
+    private static final String effectText = "sacrifice it unless you return an artifact you control to its owner's hand";
 
     static {
         filter = new FilterControlledPermanent();
diff --git a/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java
index 93965c8ad6..59f1f3e7f0 100644
--- a/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/ExchangeControlTargetEffect.java
@@ -114,7 +114,7 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl<ExchangeCo
 
     @Override
     public boolean apply(Game game, Ability source) {
-//        if (this.lockedControllers != null) {
+        if (this.lockedControllers != null) {
             for (UUID permanentId : targetPointer.getTargets(game, source)) {
                 Permanent permanent = game.getPermanent(permanentId);
                 if (permanent != null) {
@@ -132,8 +132,8 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl<ExchangeCo
                 }
             }
             return true;
-  //      }
-//        return false;
+        }
+        return false;
     }
 
     @Override