From e68bd0e876c19546b57956bd6a531b289d722986 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 22 May 2015 11:26:42 +0200 Subject: [PATCH] * Dolmen Gate - Fixed that it was not checked if the creates were attacking creatures for damage prevention. --- .../src/mage/sets/lorwyn/DolmenGate.java | 8 +- .../replacement/prevent/DolmenGateTest.java | 83 +++++++++++++++++++ 2 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DolmenGateTest.java diff --git a/Mage.Sets/src/mage/sets/lorwyn/DolmenGate.java b/Mage.Sets/src/mage/sets/lorwyn/DolmenGate.java index 10d1e3700d..ee52e29498 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/DolmenGate.java +++ b/Mage.Sets/src/mage/sets/lorwyn/DolmenGate.java @@ -34,12 +34,9 @@ import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; -import mage.constants.TargetController; import mage.constants.Zone; -import mage.filter.FilterInPlay; import mage.filter.common.FilterControlledCreatureInPlay; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -47,11 +44,10 @@ import mage.filter.predicate.permanent.ControllerPredicate; */ public class DolmenGate extends CardImpl { - private static final FilterInPlay filter = new FilterControlledCreatureInPlay("attacking creatures you control"); + private static final FilterControlledCreatureInPlay filter = new FilterControlledCreatureInPlay("attacking creatures you control"); static { - filter.add(new AttackingPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.getCreatureFilter().add(new AttackingPredicate()); } public DolmenGate(UUID ownerId) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DolmenGateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DolmenGateTest.java new file mode 100644 index 0000000000..3c2fc494e7 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/prevent/DolmenGateTest.java @@ -0,0 +1,83 @@ +/* + * 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.replacement.prevent; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author LevelX2 + */ + +public class DolmenGateTest extends CardTestPlayerBase { + + @Test + public void testPreventForAttackingCreature() { + // Prevent all combat damage that would be dealt to attacking creatures you control. + addCard(Zone.BATTLEFIELD, playerA, "Pillarfield Ox"); + + addCard(Zone.BATTLEFIELD, playerB, "Dolmen Gate"); + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion"); + + attack(2, playerB, "Silvercoat Lion"); + block(2, playerA, "Pillarfield Ox", "Silvercoat Lion"); + setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + + assertGraveyardCount(playerA, "Silvercoat Lion", 0); // damage prevented because attacking, so it does not die + } + /** + * In a commander game I was playing, a player blocked with a Dolmen Gate on the field, and the gate + * prevented the damage that was dealt to their blocking creature (it should only prevent damage to the player's attacking creatures). + */ + @Test + public void testDontPreventForBlockingCreature() { + // Prevent all combat damage that would be dealt to attacking creatures you control. + addCard(Zone.BATTLEFIELD, playerA, "Dolmen Gate"); + addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); + + addCard(Zone.BATTLEFIELD, playerB, "Pillarfield Ox"); + + attack(2, playerB, "Pillarfield Ox"); + block(2, playerA, "Silvercoat Lion", "Pillarfield Ox"); + setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + + assertGraveyardCount(playerA, "Silvercoat Lion", 1); // no damage prevented because blocking, so it has to die + } + +}