From 13af25bd1df7bdce4816987c7a8a11dbbc54175a Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 19 Jun 2013 16:12:11 +0200
Subject: [PATCH] * Seasinger - Fixed a bug that the controlling effect of
 target creature was reactivated if Seasinger was tapped again, also if not
 the same creature was targeted again. So Seasinger could control multiple
 creatures with untapping and using the control ability again.

---
 .../mage/sets/fallenempires/Seasinger.java    | 22 ++-----------------
 .../decorator/ConditionalContinousEffect.java |  5 ++++-
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java b/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java
index 71d027b96f..650f0c5984 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java
@@ -35,8 +35,8 @@ import mage.abilities.Ability;
 import mage.abilities.StateTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.common.SkipUntapOptionalAbility;
-import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.ControlsPermanentCondition;
+import mage.abilities.condition.common.SourceTappedCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.decorator.ConditionalContinousEffect;
 import mage.abilities.effects.common.SacrificeSourceEffect;
@@ -89,7 +89,7 @@ public class Seasinger extends CardImpl<Seasinger> {
         this.addAbility(new SkipUntapOptionalAbility());
 
         // {tap}: Gain control of target creature whose controller controls an Island for as long as you control Seasinger and Seasinger remains tapped.
-        ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.Custom), new ControlsPermanentCondition(seasinger, ControlsPermanentCondition.CountType.EQUAL_TO, 1, TappedCondition.getInstance()), rule);
+        ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.Custom), new ControlsPermanentCondition(seasinger, ControlsPermanentCondition.CountType.EQUAL_TO, 1, SourceTappedCondition.getInstance()), rule);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
         creatureWhoseControllerControlsIsland.add(new ControllerControlsIslandPredicate());
         ability.addTarget(new TargetCreaturePermanent(creatureWhoseControllerControlsIsland));
@@ -148,21 +148,3 @@ class SeasingerTriggeredAbility extends StateTriggeredAbility<SeasingerTriggered
         return "When you control no islands, sacrifice {this}.";
     }
 }
-
-class TappedCondition implements Condition {
-
-    private static TappedCondition fInstance = new TappedCondition();
-
-    public static Condition getInstance() {
-        return fInstance;
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Permanent seasinger = game.getBattlefield().getPermanent(source.getSourceId());
-        if (seasinger != null) {
-            return seasinger.isTapped();
-        }
-        return false;
-    }
-}
diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
index 0614935d66..b337961217 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java
@@ -1,12 +1,12 @@
 package mage.abilities.decorator;
 
-import mage.constants.Duration;
 import mage.abilities.Ability;
 import mage.abilities.Mode;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.FixedCondition;
 import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.ContinuousEffectImpl;
+import mage.constants.Duration;
 import mage.constants.Layer;
 import mage.constants.SubLayer;
 import mage.game.Game;
@@ -84,6 +84,9 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
         if (!condition.apply(game, source) && effect.getDuration() == Duration.OneUse) {
             used = true;
         }
+        if (!condition.apply(game, source) && effect.getDuration() == Duration.Custom) {
+            this.discard();
+        }
         return false;
     }