Added a test.

Mage.Sets/src/mage/sets/magic2011/SerraAscendant.java

@@ -1,16 +1,16 @@
 /*
  *  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
@@ -20,22 +20,14 @@
  *  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.sets.magic2011;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Layer;
-import mage.constants.Outcome;
-import mage.constants.Rarity;
-import mage.constants.SubLayer;
-import mage.constants.Zone;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
@@ -43,6 +35,13 @@ import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.LifelinkAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Layer;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.SubLayer;
+import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -64,7 +63,7 @@ public class SerraAscendant extends CardImpl {
 
         // Lifelink (Damage dealt by this creature also causes you to gain that much life.)
         this.addAbility(LifelinkAbility.getInstance());
-        
+
         // As long as you have 30 or more life, Serra Ascendant gets +5/+5 and has flying.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SerraAscendantEffect()));
     }
@@ -99,9 +98,9 @@ class SerraAscendantEffect extends ContinuousEffectImpl {
     @Override
     public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
         Permanent creature = game.getPermanent(source.getSourceId());
-        if (creature != null) {
+        Player controller = game.getPlayer(source.getControllerId());
-            Player player = game.getPlayer(creature.getControllerId());
+        if (creature != null && controller != null) {
-            if (player != null && player.getLife() >= 30) {
+            if (controller.getLife() >= 30) {
                 switch (layer) {
                     case PTChangingEffects_7:
                         if (sublayer == SubLayer.ModifyPT_7c) {
@@ -111,12 +110,13 @@ class SerraAscendantEffect extends ContinuousEffectImpl {
                         break;
                     case AbilityAddingRemovingEffects_6:
                         if (sublayer == SubLayer.NA) {
-                            creature.addAbility(FlyingAbility.getInstance(), game);
+                            creature.addAbility(FlyingAbility.getInstance(), source.getSourceId(), game);
                         }
                         break;
                 }
-                return true;
+
             }
+            return true;
         }
         return false;
     }
@@ -128,7 +128,7 @@ class SerraAscendantEffect extends ContinuousEffectImpl {
 
     @Override
     public boolean hasLayer(Layer layer) {
-        return layer == Layer.AbilityAddingRemovingEffects_6 || layer == layer.PTChangingEffects_7;
+        return Layer.AbilityAddingRemovingEffects_6.equals(layer) || Layer.PTChangingEffects_7.equals(layer);
     }
 
-}
+}

Mage.Sets/src/mage/sets/timespiral/KaervekTheMerciless.java

@@ -98,9 +98,9 @@ class KaervekTheMercilessEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        MageObject spellCast = game.getObject(targetPointer.getFirst(game, source));
+        MageObject spellCast = game.getObject(getTargetPointer().getFirst(game, source));
         if (spellCast instanceof Spell) {
-            int cost = ((Spell)spellCast).getConvertedManaCost();
+            int cost = ((Spell) spellCast).getConvertedManaCost();
             Player target = game.getPlayer(source.getFirstTarget());
             if (target != null) {
                 target.damage(cost, source.getSourceId(), game, false, true);
@@ -108,7 +108,7 @@ class KaervekTheMercilessEffect extends OneShotEffect {
             }
             Permanent targetCreature = game.getPermanent(source.getFirstTarget());
             if (targetCreature != null) {
-                targetCreature.damage(cost, source.getSourceId(), game, true, false);
+                targetCreature.damage(cost, source.getSourceId(), game, false, true);
                 return true;
             }
         }

Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java

@@ -57,7 +57,6 @@ public class TemporalIsolation extends CardImpl {
         this.expansionSetCode = "TSP";
         this.subtype.add("Aura");
 
-
         // Flash
         this.addAbility(FlashAbility.getInstance());
         // Enchant creature
@@ -65,11 +64,11 @@ public class TemporalIsolation extends CardImpl {
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
-        this.addAbility(ability);          
+        this.addAbility(ability);
         // Enchanted creature has shadow.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShadowAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)));
         // Prevent all damage that would be dealt by enchanted creature.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false)));        
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false)));
     }
 
     public TemporalIsolation(final TemporalIsolation card) {

Mage.Tests/src/test/java/org/mage/test/cards/prevention/PreventAttachedEffectTest.java

@@ -0,0 +1,80 @@
+/*
+ *  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 org.mage.test.cards.prevention;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class PreventAttachedEffectTest extends CardTestPlayerBase {
+
+    /**
+     * Kaervek the Merciless still deals damage with the triggered ability when
+     * enchanted with Temporal Isolation.
+     */
+    @Test
+    public void testDamageToPlayerPrevented() {
+        // Whenever an opponent casts a spell, Kaervek the Merciless deals damage to target creature or player equal to that spell's converted mana cost.
+        addCard(Zone.BATTLEFIELD, playerA, "Kaervek the Merciless");
+        // Flash
+        // Enchant creature
+        // Enchanted creature has shadow.
+        // Prevent all damage that would be dealt by enchanted creature.
+        addCard(Zone.HAND, playerA, "Temporal Isolation", 1); // {1}{W}
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+
+        addCard(Zone.HAND, playerB, "Silvercoat Lion", 1); // {1}{W}
+        addCard(Zone.HAND, playerB, "Pillarfield Ox", 1); // {3}{W}
+        addCard(Zone.BATTLEFIELD, playerB, "Plains", 6);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Temporal Isolation", "Kaervek the Merciless");
+
+        castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Silvercoat Lion");
+        addTarget(playerA, playerB);
+        castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Pillarfield Ox");
+        addTarget(playerA, "Silvercoat Lion");
+
+        setStopAt(2, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "Kaervek the Merciless", 1);
+        assertPermanentCount(playerA, "Temporal Isolation", 1);
+
+        assertPermanentCount(playerB, "Silvercoat Lion", 1);
+        assertPermanentCount(playerB, "Pillarfield Ox", 1);
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+    }
+
+}

Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java

@@ -63,10 +63,12 @@ import mage.constants.SpellAbilityType;
 import mage.constants.Zone;
 import mage.counters.Counter;
 import mage.counters.Counters;
+import mage.filter.Filter;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterAttackingCreature;
 import mage.filter.common.FilterCreatureForCombat;
 import mage.filter.common.FilterCreatureForCombatBlock;
+import mage.filter.common.FilterCreatureOrPlayer;
 import mage.filter.common.FilterPlaneswalkerPermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.NamePredicate;
@@ -99,6 +101,7 @@ import mage.target.common.TargetCardInHand;
 import mage.target.common.TargetCardInLibrary;
 import mage.target.common.TargetCardInOpponentsGraveyard;
 import mage.target.common.TargetCardInYourGraveyard;
+import mage.target.common.TargetCreatureOrPlayer;
 import mage.target.common.TargetCreaturePermanentAmount;
 import mage.target.common.TargetPermanentOrPlayer;
 import mage.util.MessageToClient;
@@ -742,7 +745,23 @@ public class TestPlayer implements Player {
             if (target.getTargetController() != null && target.getAbilityController() != null) {
                 abilityControllerId = target.getAbilityController();
             }
-            if ((target instanceof TargetPermanent) || (target instanceof TargetPermanentOrPlayer)) {
+            if (target instanceof TargetPlayer || target instanceof TargetCreatureOrPlayer) {
+                for (String targetDefinition : targets) {
+                    if (targetDefinition.startsWith("targetPlayer=")) {
+                        String playerName = targetDefinition.substring(targetDefinition.indexOf("targetPlayer=") + 13);
+                        for (Player player : game.getPlayers().values()) {
+                            if (player.getName().equals(playerName)
+                                    && target.canTarget(computerPlayer.getId(), player.getId(), source, game)) {
+                                target.add(player.getId(), game);
+                                targets.remove(targetDefinition);
+                                return true;
+                            }
+                        }
+                    }
+                }
+
+            }
+            if ((target instanceof TargetPermanent) || (target instanceof TargetPermanentOrPlayer) || (target instanceof TargetCreatureOrPlayer)) {
                 for (String targetDefinition : targets) {
                     String[] targetList = targetDefinition.split("\\^");
                     boolean targetFound = false;
@@ -759,9 +778,13 @@ public class TestPlayer implements Player {
                                 targetName = targetName.substring(0, targetName.length() - 11);
                             }
                         }
-                        for (Permanent permanent : game.getBattlefield().getAllActivePermanents((FilterPermanent) target.getFilter(), game)) {
+                        Filter filter = target.getFilter();
+                        if (filter instanceof FilterCreatureOrPlayer) {
+                            filter = ((FilterCreatureOrPlayer) filter).getCreatureFilter();
+                        }
+                        for (Permanent permanent : game.getBattlefield().getAllActivePermanents((FilterPermanent) filter, game)) {
                             if (permanent.getName().equals(targetName) || (permanent.getName() + "-" + permanent.getExpansionSetCode()).equals(targetName)) {
-                                if (((TargetPermanent) target).canTarget(abilityControllerId, permanent.getId(), source, game) && !target.getTargets().contains(permanent.getId())) {
+                                if (target.canTarget(abilityControllerId, permanent.getId(), source, game) && !target.getTargets().contains(permanent.getId())) {
                                     if ((permanent.isCopy() && !originOnly) || (!permanent.isCopy() && !copyOnly)) {
                                         target.add(permanent.getId(), game);
                                         targetFound = true;
@@ -770,6 +793,7 @@ public class TestPlayer implements Player {
                                 }
                             }
                         }
+
                     }
                     if (targetFound) {
                         targets.remove(targetDefinition);
@@ -777,22 +801,7 @@ public class TestPlayer implements Player {
                     }
                 }
             }
-            if (target instanceof TargetPlayer) {
-                for (String targetDefinition : targets) {
-                    if (targetDefinition.startsWith("targetPlayer=")) {
-                        String playerName = targetDefinition.substring(targetDefinition.indexOf("targetPlayer=") + 13);
-                        for (Player player : game.getPlayers().values()) {
-                            if (player.getName().equals(playerName)
-                                    && ((TargetPlayer) target).canTarget(computerPlayer.getId(), player.getId(), source, game)) {
-                                target.add(player.getId(), game);
-                                targets.remove(targetDefinition);
-                                return true;
-                            }
-                        }
-                    }
-                }
 
-            }
             if (target instanceof TargetCardInHand) {
                 for (String targetDefinition : targets) {
                     String[] targetList = targetDefinition.split("\\^");

Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAttachedEffect.java

@@ -25,7 +25,6 @@
  *  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.abilities.Ability;
@@ -39,13 +38,12 @@ import mage.game.permanent.Permanent;
  *
  * @author LevelX2
  */
-
 public class PreventAllDamageByAttachedEffect extends PreventionEffectImpl {
 
     private final String attachedDescription;
 
     public PreventAllDamageByAttachedEffect(Duration duration, String attachedDescription, boolean onlyCombat) {
-        super(duration, Integer.MAX_VALUE, onlyCombat);
+        super(duration, Integer.MAX_VALUE, onlyCombat, false);
         this.attachedDescription = attachedDescription;
         staticText = setText();
     }