From 23d431a65a618c08f0bcf08870f2605977fe80cf Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 24 Mar 2015 22:46:52 +0100 Subject: [PATCH] * CantBeCounteredControlledEffect - Fixed a bug that the counter source was not cheched correctly (e.g. it was possible to counter spells with blue counters after Autumn's Veil). --- .../src/mage/sets/dissension/SpellSnare.java | 3 +- .../src/mage/sets/magic2011/AutumnsVeil.java | 3 +- .../oneshot/counterspell/AutumnsVeilTest.java | 78 +++++++++++++++++++ .../CantBeCounteredControlledEffect.java | 4 +- Mage/src/mage/game/events/GameEvent.java | 1 + 5 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/AutumnsVeilTest.java diff --git a/Mage.Sets/src/mage/sets/dissension/SpellSnare.java b/Mage.Sets/src/mage/sets/dissension/SpellSnare.java index 4d358c33b2..c1aee0a023 100644 --- a/Mage.Sets/src/mage/sets/dissension/SpellSnare.java +++ b/Mage.Sets/src/mage/sets/dissension/SpellSnare.java @@ -42,6 +42,7 @@ import mage.target.TargetSpell; * @author Loki */ public class SpellSnare extends CardImpl { + private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 2"); static { @@ -52,8 +53,6 @@ public class SpellSnare extends CardImpl { super(ownerId, 33, "Spell Snare", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "DIS"; - this.color.setBlue(true); - // Counter target spell with converted mana cost 2. this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java b/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java index ce914b9f8c..ca8ad0cd1d 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java +++ b/Mage.Sets/src/mage/sets/magic2011/AutumnsVeil.java @@ -60,9 +60,10 @@ public class AutumnsVeil extends CardImpl { public AutumnsVeil(UUID ownerId) { super(ownerId, 162, "Autumn's Veil", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "M11"; - this.color.setGreen(true); + // Spells you control can't be countered by blue or black spells this turn this.getSpellAbility().addEffect(new CantBeCounteredControlledEffect(filterTarget1, filterSource, Duration.EndOfTurn)); + // and creatures you control can't be the targets of blue or black spells this turn. this.getSpellAbility().addEffect(new CantBeTargetedAllEffect(filterTarget2, filterSource, Duration.EndOfTurn)); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/AutumnsVeilTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/AutumnsVeilTest.java new file mode 100644 index 0000000000..c9f90452c2 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/AutumnsVeilTest.java @@ -0,0 +1,78 @@ +/* + * 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.abilities.oneshot.counterspell; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * Autumn's Veil - Instant {G} + * Spells you control can't be countered by blue or black spells this turn, and creatures + * you control can't be the targets of blue or black spells this turn. + * + * + * @author LevelX2 + */ + +public class AutumnsVeilTest extends CardTestPlayerBase { + + /** + * Test that a spell can't be countered + * + */ + @Test + public void testCantBeCounteredNormal() { + addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); + addCard(Zone.HAND, playerA, "Autumn's Veil", 1); + addCard(Zone.HAND, playerA, "Runeclaw Bear", 1); + + addCard(Zone.HAND, playerB, "Counterspell"); + addCard(Zone.BATTLEFIELD, playerB, "Island", 2); + + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Autumn's Veil"); + + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Runeclaw Bear"); + castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Counterspell", "Runeclaw Bear", "Runeclaw Bear"); + + setStopAt(1, PhaseStep.END_TURN); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + + assertGraveyardCount(playerA, "Autumn's Veil", 1); + assertGraveyardCount(playerB, "Counterspell", 1); + + assertPermanentCount(playerA, "Runeclaw Bear", 1); + + } + +} \ No newline at end of file diff --git a/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java b/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java index 2126de5fcc..4776c73bf8 100644 --- a/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java @@ -89,11 +89,11 @@ public class CantBeCounteredControlledEffect extends ContinuousRuleModifyingEffe public boolean applies(GameEvent event, Ability source, Game game) { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null && spell.getControllerId().equals(source.getControllerId()) - && filterTarget.match(spell, game)) { + && filterTarget.match(spell, source.getControllerId(), game)) { if (filterSource == null) { return true; } else { - MageObject sourceObject = game.getObject(source.getSourceId()); + MageObject sourceObject = game.getObject(event.getSourceId()); if (sourceObject != null && filterSource.match(sourceObject, game)) { return true; } diff --git a/Mage/src/mage/game/events/GameEvent.java b/Mage/src/mage/game/events/GameEvent.java index 994274a1be..253c1fb807 100644 --- a/Mage/src/mage/game/events/GameEvent.java +++ b/Mage/src/mage/game/events/GameEvent.java @@ -104,6 +104,7 @@ public class GameEvent { flag indicates a special condition (e.g. TRUE if it's a colored mana from Cavern of Souls) */ MANA_PAYED, + LOSES, LOST, WINS, TARGET, TARGETED, COUNTER, COUNTERED,