github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-03 01:08:59 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Unearth - Fixed that a pahsed out creature were wrongly exiled by unearth.

Browse source
This commit is contained in:
LevelX2 2017-12-30 19:15:33 +01:00
parent 529a38a96f
commit e81f6c5e90
3 changed files with 66 additions and 27 deletions
Mage.Sets/src/mage/cards/d
DregscapeZombie.java
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords
UnearthTest.java
Mage/src/main/java/mage/abilities/effects/common
ExileSourceEffect.java

8
Mage.Sets/src/mage/cards/d/DregscapeZombie.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.cards.d;
import java.util.UUID;
@ -43,16 +42,17 @@ import mage.constants.SubType;
*/
public class DregscapeZombie extends CardImpl {
public DregscapeZombie (UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}");
public DregscapeZombie(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}");
this.subtype.add(SubType.ZOMBIE);
this.power = new MageInt(2);
this.toughness = new MageInt(1);
// Unearth {B} ({B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
this.addAbility(new UnearthAbility(new ManaCostsImpl("{B}")));
}
public DregscapeZombie (final DregscapeZombie card) {
public DregscapeZombie(final DregscapeZombie card) {
super(card);
}

79
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/UnearthTest.java
View file

@ -36,19 +36,22 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
*
* @author LevelX2
*/
public class UnearthTest extends CardTestPlayerBase {
/**
* Hellspark Elemental (and probably other cards with the unearth ability) - If I unearth the elemental,
* attack, and then go to the end of my turn both the "sacrifice" and "exile" clauses will trigger and
* the game will ask me which one I want to put on the stack first. If I choose "sacrifice" first and
* "exile" second, all good, the exile part resolves first and the elemental is exiled, the sacrifice
* part does nothing afterwards. But if I choose "exile" first and "sacrifice" second then the elemental
* will be sacrificed and placed on my graveyard and after that the "exile" resolves but does nothing, as
* I'm guessing it can't "find" the elemental anymore and so it stays in my graveyard, despite the fact
* that because I use its unearth ability it should always be exiled once leaving the battlefield no matter what.
* The bug should be easy to reproduce if following the order I mention above (click the exile part,
* Hellspark Elemental (and probably other cards with the unearth ability) -
* If I unearth the elemental, attack, and then go to the end of my turn
* both the "sacrifice" and "exile" clauses will trigger and the game will
* ask me which one I want to put on the stack first. If I choose
* "sacrifice" first and "exile" second, all good, the exile part resolves
* first and the elemental is exiled, the sacrifice part does nothing
* afterwards. But if I choose "exile" first and "sacrifice" second then the
* elemental will be sacrificed and placed on my graveyard and after that
* the "exile" resolves but does nothing, as I'm guessing it can't "find"
* the elemental anymore and so it stays in my graveyard, despite the fact
* that because I use its unearth ability it should always be exiled once
* leaving the battlefield no matter what. The bug should be easy to
* reproduce if following the order I mention above (click the exile part,
* so the sacrifice goes on the top of the stack).
*/
@Test
@ -56,15 +59,15 @@ public class UnearthTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2);
// 3/1 - Trample, haste
// At the beginning of the end step, sacrifice Hellspark Elemental.
// Unearth {1}{R} ({1}{R}: Return this card from your graveyard to the battlefield.
// It gains haste. Exile it at the beginning of the next end step or if it would
// leave the battlefield. Unearth only as a sorcery.)
// Unearth {1}{R} ({1}{R}: Return this card from your graveyard to the battlefield.
// It gains haste. Exile it at the beginning of the next end step or if it would
// leave the battlefield. Unearth only as a sorcery.)
addCard(Zone.GRAVEYARD, playerA, "Hellspark Elemental", 1);
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Unearth");
attack(1, playerA, "Hellspark Elemental");
setStopAt(2, PhaseStep.UNTAP);
execute();
@ -74,22 +77,23 @@ public class UnearthTest extends CardTestPlayerBase {
assertPermanentCount(playerA, "Hellspark Elemental", 0);
assertExileCount("Hellspark Elemental", 1);
}
/**
* Reported bug: Cards with unearth (e.g. Undead Leotau) are currently bugged. When you bring a creature back from the graveyard
* with unearth, it [should] get exiled at end of turn normally, [but instead] a copy of the card stays on the battlefield
* under your control permanently.
* Reported bug: Cards with unearth (e.g. Undead Leotau) are currently
* bugged. When you bring a creature back from the graveyard with unearth,
* it [should] get exiled at end of turn normally, [but instead] a copy of
* the card stays on the battlefield under your control permanently.
*/
@Test
public void testUndeadLeotau() {
//{R}: Undead Leotau gets +1/-1 until end of turn.
// Unearth {2}{B}
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3);
addCard(Zone.GRAVEYARD, playerA, "Undead Leotau", 1); // 3/4
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Unearth");
attack(1, playerA, "Undead Leotau");
setStopAt(2, PhaseStep.UNTAP);
execute();
@ -97,6 +101,35 @@ public class UnearthTest extends CardTestPlayerBase {
assertLife(playerB, 17);
assertPermanentCount(playerA, "Undead Leotau", 0);
assertExileCount("Undead Leotau", 1);
assertExileCount("Undead Leotau", 1);
}
}
/**
* At start of the end phase, creatures phased out by Teferi's Veil still
* exiled by unearth if they were put to battlefield by unearth.<br>
*
* http://www.mtgsalvation.com/forums/magic-fundamentals/magic-rulings/magic-rulings-archives/294911-teferis-veil-and-unearth
*/
@Test
public void testUnearthWithPhasing() {
// Whenever a creature you control attacks, it phases out at end of combat.
addCard(Zone.BATTLEFIELD, playerA, "Teferi's Veil", 1);
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
// Unearth {B} ({B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
addCard(Zone.GRAVEYARD, playerA, "Dregscape Zombie", 1); // 2/1
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Unearth");
attack(1, playerA, "Dregscape Zombie");
setStopAt(3, PhaseStep.PRECOMBAT_MAIN);
execute();
assertGraveyardCount(playerA, "Dregscape Zombie", 0);
assertLife(playerB, 18);
assertExileCount("Dregscape Zombie", 0);
assertPermanentCount(playerA, "Dregscape Zombie", 1);
}
}

6
Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java
View file

@ -34,6 +34,7 @@ import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.Outcome;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.util.CardUtil;
@ -77,6 +78,11 @@ public class ExileSourceEffect extends OneShotEffect {
if (controller != null) {
MageObject sourceObject = source.getSourceObjectIfItStillExists(game);
if (sourceObject instanceof Card) {
if (sourceObject instanceof Permanent) {
if (!((Permanent) sourceObject).isPhasedIn()) {
return true;
}
}
UUID exileZoneId = null;
String exileZoneName = "";
if (toUniqueExileZone) {