Reimplemented Indestructable using a replacement effect

Mage/src/mage/abilities/effects/common/IndestructibleSourceEffect.java

@@ -0,0 +1,72 @@
+/*
+ *  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.effects.common;
+
+import mage.Constants.Duration;
+import mage.Constants.Outcome;
+import mage.abilities.Ability;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+
+/**
+ *
+ * @author North
+ */
+public class IndestructibleSourceEffect extends ReplacementEffectImpl<IndestructibleSourceEffect> {
+
+    public IndestructibleSourceEffect(Duration duration) {
+        super(duration, Outcome.Benefit);
+        this.staticText = "{this} is indestructible";
+    }
+
+    public IndestructibleSourceEffect(ReplacementEffectImpl effect) {
+        super(effect);
+    }
+
+    @Override
+    public IndestructibleSourceEffect copy() {
+        return new IndestructibleSourceEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
+
+    @Override
+    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+        return true;
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        return event.getType().equals(GameEvent.EventType.DESTROY_PERMANENT)
+                && event.getTargetId().equals(source.getSourceId());
+    }
+}

Mage/src/mage/abilities/keyword/IndestructibleAbility.java

@@ -25,43 +25,29 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.abilities.keyword;
 
+import mage.Constants.Duration;
 import mage.Constants.Zone;
-import mage.abilities.MageSingleton;
 import mage.abilities.StaticAbility;
-
-import java.io.ObjectStreamException;
+import mage.abilities.effects.common.IndestructibleSourceEffect;
 
 /**
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class IndestructibleAbility extends StaticAbility<IndestructibleAbility> implements MageSingleton {
+public class IndestructibleAbility extends StaticAbility<IndestructibleAbility> {
 
-    private static final IndestructibleAbility fINSTANCE =  new IndestructibleAbility();
-
-    private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
+    public IndestructibleAbility() {
+        super(Zone.BATTLEFIELD, new IndestructibleSourceEffect(Duration.WhileOnBattlefield));
     }
 
-    public static IndestructibleAbility getInstance() {
-        return fINSTANCE;
-    }
-
-    private IndestructibleAbility() {
-        super(Zone.BATTLEFIELD, null);
-    }
-
-    @Override
-    public String getRule() {
-        return "Indestructible";
+    private IndestructibleAbility(IndestructibleAbility ability) {
+        super(ability);
     }
 
     @Override
     public IndestructibleAbility copy() {
-        return fINSTANCE;
+        return new IndestructibleAbility(this);
     }
-
 }

Mage/src/mage/game/permanent/PermanentImpl.java

@@ -727,11 +727,9 @@ public abstract class PermanentImpl<T extends PermanentImpl<T>> extends CardImpl
         //20091005 - 701.6
         //TODO: handle noRegen
         if (!game.replaceEvent(GameEvent.getEvent(EventType.DESTROY_PERMANENT, objectId, sourceId, controllerId, noRegen ? 1 : 0))) {
-            if (!this.getAbilities().containsKey(IndestructibleAbility.getInstance().getId())) {
-                if (moveToZone(Zone.GRAVEYARD, sourceId, game, false)) {
-                    game.fireEvent(GameEvent.getEvent(EventType.DESTROYED_PERMANENT, objectId, sourceId, controllerId));
-                    return true;
-                }
+            if (moveToZone(Zone.GRAVEYARD, sourceId, game, false)) {
+                game.fireEvent(GameEvent.getEvent(EventType.DESTROYED_PERMANENT, objectId, sourceId, controllerId));
+                return true;
             }
         }
         return false;