Fixes and improvements to framework classes.

Mage/src/mage/abilities/condition/common/PermanentOnBattelfieldCondition.java

@@ -0,0 +1,48 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.abilities.condition.common;
+
+import mage.abilities.Ability;
+import mage.abilities.condition.Condition;
+import mage.game.Game;
+
+
+/**
+ * As long as the sourceId permanent is
+ * on the battlefield, the condition is true.
+ *
+ * @author LevelX2
+ */
+public class PermanentOnBattelfieldCondition implements Condition {
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return (game.getPermanent(source.getSourceId()) != null);
+    }
+
+}

Mage/src/mage/abilities/condition/common/PermanentOnBattlefieldControlUnchangedCondition.java

@@ -0,0 +1,56 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.abilities.condition.common;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.condition.Condition;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ * This condition remembers controller on the first apply.
+ * As long as this controller keeps unchanged and the source is
+ * on the battlefield, the condition is true.
+ *
+ * @author LevelX2
+ */
+public class PermanentOnBattlefieldControlUnchangedCondition implements Condition {
+    
+    private UUID controllerId;
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        if (controllerId == null) {
+            controllerId = source.getControllerId();
+        }
+        Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId());
+        return (permanent != null && controllerId == source.getControllerId());
+    }
+
+}

Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java

@@ -75,7 +75,7 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl<Conditional
 
     @Override
     public boolean isDiscarded() {
-        return effect.isDiscarded() || (otherwiseEffect != null && otherwiseEffect.isDiscarded());
+        return this.discarded || effect.isDiscarded() || (otherwiseEffect != null && otherwiseEffect.isDiscarded());
     }
     
     @Override

Mage/src/mage/abilities/effects/ContinuousEffects.java

@@ -778,8 +778,7 @@ public class ContinuousEffects implements Serializable {
                 spliceCardEffects.addEffect(newSpliceCardEffect, source);
                 break;
             default:
-                ContinuousEffect newEffect = (ContinuousEffect)effect;
+                layeredEffects.addEffect(effect, source);
-                layeredEffects.addEffect(newEffect, source);
                 break;
         }
     }

Mage/src/mage/abilities/effects/common/continious/GainControlTargetEffect.java

@@ -28,13 +28,14 @@
 
 package mage.abilities.effects.common.continious;
 
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.effects.ContinuousEffectImpl;
 import mage.constants.Duration;
 import mage.constants.Layer;
 import mage.constants.Outcome;
 import mage.constants.SubLayer;
-import mage.abilities.Ability;
-import mage.abilities.Mode;
-import mage.abilities.effects.ContinuousEffectImpl;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
@@ -44,12 +45,22 @@ import mage.game.permanent.Permanent;
  */
 public class GainControlTargetEffect extends ContinuousEffectImpl<GainControlTargetEffect> {
 
+    private UUID fixedControllerId;
+    private boolean fixedController;
+
     public GainControlTargetEffect(Duration duration) {
+        this(duration, false);
+    }
+
+    public GainControlTargetEffect(Duration duration, boolean fixedController) {
         super(duration, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl);
+        this.fixedController = fixedController;
     }
 
     public GainControlTargetEffect(final GainControlTargetEffect effect) {
         super(effect);
+        this.fixedControllerId = effect.fixedControllerId;
+        this.fixedController = effect.fixedController;
     }
 
     @Override
@@ -58,14 +69,23 @@ public class GainControlTargetEffect extends ContinuousEffectImpl<GainControlTar
     }
 
     @Override
-    public boolean apply(Game game, Ability source) {
+    public void init(Ability source, Game game) {
-        Permanent permanent = game.getPermanent(source.getFirstTarget());
+        if (fixedController) {
-        if (targetPointer != null) {
+            this.fixedControllerId = source.getControllerId();
-            permanent = game.getPermanent(targetPointer.getFirst(game, source));
         }
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source));
         if (permanent != null) {
+            if (fixedController) {
+                return permanent.changeControllerId(fixedControllerId, game);
+            } else {
                 return permanent.changeControllerId(source.getControllerId(), game);
             }
+        
+        }
         return false;
     }