From 034ef22468aacdb48a92bfe144b8295090d40687 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 30 Jan 2017 21:19:17 +0100 Subject: [PATCH] * Fixed PreventDamageByTargetEffect to handle delayed spell damge (fixes #2822). --- .../src/mage/cards/d/DromokasCommand.java | 4 +- .../prevent/DeflectingPalmTest.java | 57 +++++++++++++++++-- .../common/PreventDamageByTargetEffect.java | 16 ++++-- .../main/java/mage/target/TargetSpell.java | 16 ++++++ 4 files changed, 81 insertions(+), 12 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DromokasCommand.java b/Mage.Sets/src/mage/cards/d/DromokasCommand.java index 8666a76e0f8..51bb89c387e 100644 --- a/Mage.Sets/src/mage/cards/d/DromokasCommand.java +++ b/Mage.Sets/src/mage/cards/d/DromokasCommand.java @@ -64,9 +64,9 @@ public class DromokasCommand extends CardImpl { } public DromokasCommand(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{G}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{G}{W}"); - // Choose two - Prevent all damage target instant or sorcery spell would deal this turn; Target player sacrifices an enchantment; Put a +1/+1 counter on target creature; or Target creature you control fights target creature you don't control. + // Choose two - this.getSpellAbility().getModes().setMinModes(2); this.getSpellAbility().getModes().setMaxModes(2); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DeflectingPalmTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DeflectingPalmTest.java index a3bba93f6ab..c98cab73a1f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DeflectingPalmTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DeflectingPalmTest.java @@ -32,18 +32,18 @@ import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; - /** - * Deflecting Palm Instant {R}{W} - * The next time a source of your choice would deal damage to you this turn, prevent that damage. - * If damage is prevented this way, Deflecting Palm deals that much damage to that source's controller. + * Deflecting Palm Instant {R}{W} The next time a source of your choice would + * deal damage to you this turn, prevent that damage. If damage is prevented + * this way, Deflecting Palm deals that much damage to that source's controller. * * @author LevelX2 */ public class DeflectingPalmTest extends CardTestPlayerBase { /** - * Tests if a damage spell is selected as source the damage is prevented and is dealt to the controller of the damage spell + * Tests if a damage spell is selected as source the damage is prevented and + * is dealt to the controller of the damage spell */ @Test public void testPreventDamageFromSpell() { @@ -53,7 +53,7 @@ public class DeflectingPalmTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Deflecting Palm"); addCard(Zone.BATTLEFIELD, playerB, "Mountain"); addCard(Zone.BATTLEFIELD, playerB, "Plains"); - + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Deflecting Palm", null, "Lightning Bolt"); setChoice(playerB, "Lightning Bolt"); @@ -68,4 +68,49 @@ public class DeflectingPalmTest extends CardTestPlayerBase { assertGraveyardCount(playerB, "Deflecting Palm", 1); } + /** + * I tried to prevent damage dealt by Deflecting Palm using a Drokoma's + * Command and it seems it's not working properly. According to this, it + * should work. + */ + @Test + public void testPreventDamageWithDromokasCommand() { + + // Choose two - + // - Prevent all damage target instant or sorcery spell would deal this turn; + // - or Target player sacrifices an enchantment; + // - Put a +1/+1 counter on target creature; + // - or Target creature you control fights target creature you don't control. + addCard(Zone.HAND, playerA, "Dromoka's Command");// Instant {G}{W} + addCard(Zone.BATTLEFIELD, playerA, "Plains"); + addCard(Zone.BATTLEFIELD, playerA, "Forest"); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); // Creature 2/2 + + // The next time a source of your choice would deal damage to you this turn, prevent that damage. + // If damage is prevented this way, Deflecting Palm deals that much damage to that source's controller. + addCard(Zone.HAND, playerB, "Deflecting Palm"); // Instant {R}{W} + addCard(Zone.BATTLEFIELD, playerB, "Mountain"); + addCard(Zone.BATTLEFIELD, playerB, "Plains"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Deflecting Palm"); + setChoice(playerB, "Silvercoat Lion"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dromoka's Command", "Deflecting Palm"); + addTarget(playerA, "Silvercoat Lion"); + setModeChoice(playerA, "1"); + setModeChoice(playerA, "3"); + + attack(1, playerA, "Silvercoat Lion"); + + setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); + execute(); + assertGraveyardCount(playerB, "Deflecting Palm", 1); + assertGraveyardCount(playerA, "Dromoka's Command", 1); + + assertPowerToughness(playerA, "Silvercoat Lion", 3, 3); + + assertLife(playerA, 20); + assertLife(playerB, 20); + + } + } diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java index 873da6beac9..5d047321a7e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java @@ -25,17 +25,18 @@ * 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.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.PreventionEffectImpl; +import mage.constants.CardType; import mage.constants.Duration; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.stack.Spell; +import mage.target.Target; +import mage.target.TargetSpell; /** * @author nantuko @@ -71,8 +72,15 @@ public class PreventDamageByTargetEffect extends PreventionEffectImpl { public boolean applies(GameEvent event, Ability source, Game game) { if (!this.used && super.applies(event, source, game)) { MageObject mageObject = game.getObject(event.getSourceId()); - if (mageObject instanceof Spell){ - return this.getTargetPointer().getTargets(game, source).contains(mageObject.getId()); + if (mageObject != null + && (mageObject.getCardType().contains(CardType.INSTANT) || mageObject.getCardType().contains(CardType.SORCERY))) { + for (Target target : source.getTargets()) { + if (target instanceof TargetSpell) { + if (((TargetSpell) target).getSourceIds().contains(event.getSourceId())) { + return true; + } + } + } } return this.getTargetPointer().getTargets(game, source).contains(event.getSourceId()); } diff --git a/Mage/src/main/java/mage/target/TargetSpell.java b/Mage/src/main/java/mage/target/TargetSpell.java index aad10b11ef8..408e277bf93 100644 --- a/Mage/src/main/java/mage/target/TargetSpell.java +++ b/Mage/src/main/java/mage/target/TargetSpell.java @@ -44,6 +44,7 @@ import mage.game.stack.StackObject; public class TargetSpell extends TargetObject { protected final FilterSpell filter; + private final Set sourceIds = new HashSet<>(); public TargetSpell() { this(1, 1, new FilterSpell()); @@ -68,6 +69,7 @@ public class TargetSpell extends TargetObject { public TargetSpell(final TargetSpell target) { super(target); this.filter = target.filter.copy(); + this.sourceIds.addAll(target.sourceIds); } @Override @@ -134,4 +136,18 @@ public class TargetSpell extends TargetObject { && game.getState().getPlayersInRange(sourceControllerId, game).contains(stackObject.getControllerId()) && filter.match(stackObject, sourceID, sourceControllerId, game); } + + @Override + public void addTarget(UUID id, Ability source, Game game, boolean skipEvent) { + Spell spell = game.getStack().getSpell(id); + if (spell != null) { // remember the original sourceID + sourceIds.add(spell.getSourceId()); + } + super.addTarget(id, source, game, skipEvent); + } + + public Set getSourceIds() { + return sourceIds; + } + }