mirror of
https://github.com/magefree/mage.git
synced 2025-12-22 19:41:59 -08:00
* Fixed a bug that target event was wrongly created if effects like chnage target of Spellskite didn't change the target.
This commit is contained in:
parent
4a86a9a01e
commit
4f2c21a146
3 changed files with 36 additions and 8 deletions
|
|
@ -25,14 +25,13 @@
|
||||||
* authors and should not be interpreted as representing official policies, either expressed
|
* authors and should not be interpreted as representing official policies, either expressed
|
||||||
* or implied, of BetaSteward_at_googlemail.com.
|
* or implied, of BetaSteward_at_googlemail.com.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package mage.sets.riseoftheeldrazi;
|
package mage.sets.riseoftheeldrazi;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import mage.constants.CardType;
|
|
||||||
import mage.constants.Rarity;
|
|
||||||
import mage.abilities.effects.common.DamageTargetEffect;
|
import mage.abilities.effects.common.DamageTargetEffect;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
|
import mage.constants.CardType;
|
||||||
|
import mage.constants.Rarity;
|
||||||
import mage.target.common.TargetCreaturePermanent;
|
import mage.target.common.TargetCreaturePermanent;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -45,6 +44,7 @@ public class FlameSlash extends CardImpl {
|
||||||
super(ownerId, 145, "Flame Slash", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}");
|
super(ownerId, 145, "Flame Slash", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}");
|
||||||
this.expansionSetCode = "ROE";
|
this.expansionSetCode = "ROE";
|
||||||
|
|
||||||
|
// Flame Slash deals 4 damage to target creature.
|
||||||
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
|
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
|
||||||
this.getSpellAbility().addEffect(new DamageTargetEffect(4));
|
this.getSpellAbility().addEffect(new DamageTargetEffect(4));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -225,4 +225,29 @@ public class SpellskiteTest extends CardTestPlayerBase {
|
||||||
assertLife(playerB, 20);
|
assertLife(playerB, 20);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When an AI opponent casts a spell targeting one of my creatures, Wild
|
||||||
|
* Defiance does not trigger. (Tested with Flame Slash, which was able to
|
||||||
|
* kill my Spellskite)
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testWildDefiance() {
|
||||||
|
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
|
||||||
|
// Flame Slash deals 4 damage to target creature.
|
||||||
|
addCard(Zone.HAND, playerA, "Flame Slash"); // {R}
|
||||||
|
|
||||||
|
// 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, playerB, "Wild Defiance", 1);
|
||||||
|
addCard(Zone.BATTLEFIELD, playerB, "Spellskite", 1);
|
||||||
|
|
||||||
|
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Flame Slash", "Spellskite");
|
||||||
|
|
||||||
|
setStopAt(1, PhaseStep.BEGIN_COMBAT);
|
||||||
|
execute();
|
||||||
|
|
||||||
|
assertGraveyardCount(playerA, "Flame Slash", 1);
|
||||||
|
assertPowerToughness(playerB, "Spellskite", 3, 7);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,9 @@ public class ChangeATargetOfTargetSpellAbilityToSourceEffect extends OneShotEffe
|
||||||
boolean twoTimesTarget = false;
|
boolean twoTimesTarget = false;
|
||||||
if (targets.size() == 1 && targets.get(0).getTargets().size() == 1) {
|
if (targets.size() == 1 && targets.get(0).getTargets().size() == 1) {
|
||||||
Target target = targets.get(0);
|
Target target = targets.get(0);
|
||||||
|
if (target.getFirstTarget().equals(source.getSourceId())) {
|
||||||
|
return true; // Target was already the same source, so no change / target event to create
|
||||||
|
}
|
||||||
if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game)) {
|
if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game)) {
|
||||||
oldTargetName = getTargetName(targets.getFirstTarget(), game);
|
oldTargetName = getTargetName(targets.getFirstTarget(), game);
|
||||||
target.clearChosen();
|
target.clearChosen();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue