* Spellskite - Fixed that abilities (like the one of Wild Defiance) did not trigger if target was changed to Spellskite.

Mage.Sets/src/mage/sets/avacynrestored/WildDefiance.java

@@ -27,15 +27,16 @@
  */
 package mage.sets.avacynrestored;
 
-import mage.constants.CardType;
+import java.util.UUID;
-import mage.constants.Rarity;
 import mage.MageObject;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -43,8 +44,6 @@ import mage.game.permanent.Permanent;
 import mage.game.stack.Spell;
 import mage.target.targetpointer.FixedTarget;
 
-import java.util.UUID;
-
 /**
  * @author noxx
  */
@@ -54,8 +53,6 @@ public class WildDefiance extends CardImpl {
         super(ownerId, 203, "Wild Defiance", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}");
         this.expansionSetCode = "AVR";
 
-        this.color.setGreen(true);
-
         // Whenever a creature you control becomes the target of an instant or sorcery spell, that creature gets +3/+3 until end of turn.
         this.addAbility(new CreaturesYouControlBecomesTargetTriggeredAbility(new BoostTargetEffect(3, 3, Duration.EndOfTurn)));
     }
@@ -85,22 +82,25 @@ class CreaturesYouControlBecomesTargetTriggeredAbility extends TriggeredAbilityI
         return new CreaturesYouControlBecomesTargetTriggeredAbility(this);
     }
 
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.TARGETED;
+    }
+
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.TARGETED) {
+        Permanent permanent = game.getPermanent(event.getTargetId());
-            Permanent permanent = game.getPermanent(event.getTargetId());
+        if (permanent != null && permanent.getControllerId().equals(this.controllerId) && permanent.getCardType().contains(CardType.CREATURE)) {
-            if (permanent != null && permanent.getControllerId().equals(this.controllerId) && permanent.getCardType().contains(CardType.CREATURE)) {
+            MageObject object = game.getObject(event.getSourceId());
-                MageObject object = game.getObject(event.getSourceId());
+            if (object != null && object instanceof Spell) {
-                if (object != null && object instanceof Spell) {
+                Card c = (Spell)object;
-                    Card c = (Spell)object;
+                if (c.getCardType().contains(CardType.INSTANT) || c.getCardType().contains(CardType.SORCERY)) {
-                    if (c.getCardType().contains(CardType.INSTANT) || c.getCardType().contains(CardType.SORCERY)) {
+                    if (getTargets().size() == 0) {
-                        if (getTargets().size() == 0) {
+                        for (Effect effect : getEffects()) {
-                            for (Effect effect : getEffects()) {
+                            effect.setTargetPointer(new FixedTarget(event.getTargetId()));
-                                effect.setTargetPointer(new FixedTarget(event.getTargetId()));
-                            }
                         }
-                        return true;
                     }
+                    return true;
                 }
             }
         }

Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java

@@ -113,7 +113,8 @@ class SpellskiteEffect extends OneShotEffect {
                 if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game)) {
                     oldTarget = game.getObject(targets.getFirstTarget());
                     target.clearChosen();
-                    target.add(source.getSourceId(), game);
+                    // The source is still the spell on the stack
+                    target.addTarget(source.getSourceId(), stackObject.getStackAbility(), game);
                 }                
             }
             else {
@@ -137,7 +138,8 @@ class SpellskiteEffect extends OneShotEffect {
                             if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game)) {
                                 oldTarget = game.getObject(targets.getFirstTarget());
                                 target.remove(targetId);
-                                target.addTarget(source.getSourceId(), source, game);
+                                // The source is still the spell on the stack
+                                target.addTarget(source.getSourceId(), stackObject.getStackAbility(), game);
                                 break;
                             }
                         }

Mage.Tests/src/test/java/org/mage/test/cards/triggers/SpellskiteTest.java

@@ -0,0 +1,70 @@
+/*
+ *  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.triggers;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class SpellskiteTest extends CardTestPlayerBase {
+
+    /**
+     * Tests that Wild Defiance triggers for Spellskite if spell target is changed to Spellskite
+     */
+    @Test
+    public void testDisabledEffectOnChangeZone() {
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
+        // Whenever a creature you control becomes the target of an instant or sorcery spell, that creature gets +3/+3 until end of turn.
+        addCard(Zone.BATTLEFIELD, playerA, "Wild Defiance", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Spellskite", 1);
+        addCard(Zone.HAND, playerA, "Lightning Bolt");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{UP}: Change a target of target spell or ability to {this}.", "Lightning Bolt");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerA, "Lightning Bolt", 1);
+        assertPermanentCount(playerA, "Spellskite", 1);
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+
+        assertPowerToughness(playerA, "Spellskite", 3, 7);
+        
+    }
+
+}