diff --git a/Mage.Sets/src/mage/cards/d/DoublingSeason.java b/Mage.Sets/src/mage/cards/d/DoublingSeason.java index 47da3761361..29126779fc1 100644 --- a/Mage.Sets/src/mage/cards/d/DoublingSeason.java +++ b/Mage.Sets/src/mage/cards/d/DoublingSeason.java @@ -40,7 +40,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; -import mage.game.stack.StackObject; /** * @@ -91,8 +90,7 @@ class DoublingSeasonTokenEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - StackObject stackObject = game.getStack().getStackObject(event.getSourceId()); - return stackObject != null && event.getPlayerId().equals(source.getControllerId()); + return event.getPlayerId().equals(source.getControllerId()); } @Override diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java index 73b86da1526..a58b0bb718f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java @@ -166,4 +166,30 @@ public class DoublingSeasonTest extends CardTestPlayerBase { } + @Test + public void testDoubleRiteOfRagingStormOpponent() { + // At the beginning of each player's upkeep, that player creates a 5/1 red Elemental creature token named Lightning Rager. + // It has trample, haste, and "At the beginning of the end step, sacrifice this creature." + addCard(Zone.HAND, playerA, "Rite of the Raging Storm");// {3}{R}{R} + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); + // If an effect would put one or more tokens onto the battlefield under your control, it puts twice that many of those tokens onto the battlefield instead. + // If an effect would place one or more counters on a permanent you control, it places twice that many of those counters on that permanent instead. + addCard(Zone.BATTLEFIELD, playerB, "Doubling Season"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rite of the Raging Storm"); + + attack(2, playerB, "Lightning Rager"); // Can't attack + attack(2, playerA, "Lightning Rager"); // Can't attack + + setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); + execute(); + + assertPermanentCount(playerA, "Rite of the Raging Storm", 1); + + assertPermanentCount(playerB, "Lightning Rager", 2); + + assertLife(playerB, 20); + assertLife(playerA, 20); + + } }