From 07a6c8154a80d3dbfdb462b0e42a6ceb32668b38 Mon Sep 17 00:00:00 2001 From: LevelX2 <ludwig.hirth@online.de> Date: Sun, 22 Mar 2015 09:45:19 +0100 Subject: [PATCH] * Fracturing Gust - Fixed that the life gain did not work if permanent with life gain preventing effect was destroyed. --- .../mage/sets/commander2013/WitchHunt.java | 2 - .../mage/sets/shadowmoor/FracturingGust.java | 15 ++++- .../test/cards/single/FracturingGustTest.java | 64 +++++++++++++++++++ 3 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/single/FracturingGustTest.java diff --git a/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java b/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java index b11004d196..eadba447e0 100644 --- a/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java +++ b/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java @@ -59,8 +59,6 @@ public class WitchHunt extends CardImpl { super(ownerId, 133, "Witch Hunt", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); this.expansionSetCode = "C13"; - this.color.setRed(true); - // Players can't gain life. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); // At the beginning of your upkeep, Witch Hunt deals 4 damage to you. diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java b/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java index 37df28dd99..28959918de 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FracturingGust.java @@ -91,10 +91,19 @@ class FracturingGustDestroyEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - for (Permanent permanent: game.getState().getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - if (permanent.destroy(source.getSourceId(), game, false)) { - controller.gainLife(2, game); + if (controller != null) { + int destroyedPermanents = 0; + for (Permanent permanent: game.getState().getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { + if (permanent.destroy(source.getSourceId(), game, false)) { + ++destroyedPermanents; + + } } + game.applyEffects(); // needed in case a destroyed permanent did prevent life gain + if (destroyedPermanents > 0) { + controller.gainLife(2 * destroyedPermanents, game); + } + return true; } return false; } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/FracturingGustTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/FracturingGustTest.java new file mode 100644 index 0000000000..a3e7c4bbd7 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/FracturingGustTest.java @@ -0,0 +1,64 @@ +/* + * 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.single; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class FracturingGustTest extends CardTestPlayerBase { + + @Test + public void testCard() { + addCard(Zone.BATTLEFIELD, playerA, "Forest", 5); + addCard(Zone.HAND, playerA, "Fracturing Gust", 1); + + addCard(Zone.BATTLEFIELD, playerB, "Witch Hunt", 1); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fracturing Gust"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + + assertGraveyardCount(playerA, "Fracturing Gust", 1); + assertGraveyardCount(playerB, "Witch Hunt", 1); + + // + 2 from destroyed Witch Hunt + assertLife(playerA, 22); + assertLife(playerB, 20); + + } + +} \ No newline at end of file