From 9ebc2d5991bcd392c91c9d637a2ccadc980e9677 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 21 Jan 2016 17:44:30 +0100 Subject: [PATCH] =?UTF-8?q?*=20Tatterkite=20-=20Fixed=20that=20it=20was=20?= =?UTF-8?q?not=20prevented=20to=20add=20counters=20if=20the=20counters=20w?= =?UTF-8?q?ere=20added=20while=20Tatterkite=20entered=20the=20battl=C3=B6e?= =?UTF-8?q?field=20(e.g.=20Undying).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/mage/sets/shadowmoor/Tatterkite.java | 2 +- .../cards/abilities/keywords/UndyingTest.java | 31 +++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Tatterkite.java b/Mage.Sets/src/mage/sets/shadowmoor/Tatterkite.java index 27c846f33a..72f220b3e1 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Tatterkite.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Tatterkite.java @@ -60,7 +60,7 @@ public class Tatterkite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Tatterkite can't have counters placed on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantHaveCountersSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new CantHaveCountersSourceEffect(Duration.WhileOnBattlefield))); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java index 058b5e5bed..61333082f4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UndyingTest.java @@ -228,6 +228,8 @@ public class UndyingTest extends CardTestPlayerBase { // Other non-Human creatures you control get +1/+1 and have undying. addCard(Zone.BATTLEFIELD, playerA, "Mikaeus, the Unhallowed", 1); + // Flying + // Tatterkite can't have counters placed on it. addCard(Zone.BATTLEFIELD, playerA, "Tatterkite", 1); // Artifact Creature - Scarecrow 2/1 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Tatterkite"); @@ -239,8 +241,33 @@ public class UndyingTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Tatterkite", 1); assertPermanentCount(playerA, "Mikaeus, the Unhallowed", 1); - assertCounterCount("Tatterkite", CounterType.P1P1, 1); - assertPowerToughness(playerA, "Tatterkite", 4, 3); + assertCounterCount("Tatterkite", CounterType.P1P1, 0); + assertPowerToughness(playerA, "Tatterkite", 3, 2); + + } + + @Test + public void testUndyingMikaeusAndTatterkiteSacrifice() { + // Sacrifice a creature: Add {C}{C} to your mana pool. + addCard(Zone.BATTLEFIELD, playerA, "Ashnod's Altar", 1); + // Whenever a Human deals damage to you, destroy it. + // Other non-Human creatures you control get +1/+1 and have undying. + addCard(Zone.BATTLEFIELD, playerA, "Mikaeus, the Unhallowed", 1); + + // Flying + // Tatterkite can't have counters placed on it. + addCard(Zone.BATTLEFIELD, playerA, "Tatterkite", 1); // Artifact Creature - Scarecrow 2/1 + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice a creature"); + setChoice(playerA, "Tatterkite"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertPermanentCount(playerA, "Tatterkite", 1); + assertPermanentCount(playerA, "Mikaeus, the Unhallowed", 1); + assertCounterCount("Tatterkite", CounterType.P1P1, 0); + assertPowerToughness(playerA, "Tatterkite", 3, 2); }