External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #12974 (zcc check in ReturnToBattlefieldUnderOwnerControlAttachedEffect)

Browse source 
add test
This commit is contained in:
xenohedron 2025-06-14 21:16:56 -04:00
parent a98f72649a
commit 7a44ee2a97
2 changed files with 64 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java
View file

@ -157,4 +157,62 @@ public class ReturnToBattlefieldEffectsTest extends CardTestPlayerBase {
assertPermanentCount(playerB, "Reassembling Skeleton", 1);
}
// issue #12974
private static final String rOrb = "Resurrection Orb";
// Whenever equipped creature dies, return that card to the battlefield under its owner's control at the beginning of the next end step.
private static final String lMiss = "Lone Missionary"; // ETB gain 4
private static final String cFeeder = "Carrion Feeder"; // sacrifice a creature: +1/+1 counter
@Test
public void testReturnAttachedToBattlefield() {
addCard(Zone.BATTLEFIELD, playerA, rOrb);
addCard(Zone.BATTLEFIELD, playerA, lMiss);
addCard(Zone.BATTLEFIELD, playerA, cFeeder);
addCard(Zone.BATTLEFIELD, playerA, "Wastes", 4);
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", lMiss);
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice");
setChoice(playerA, lMiss);
setStrictChooseMode(true);
setStopAt(2, PhaseStep.UPKEEP);
execute();
assertLife(playerA, 24);
assertPermanentCount(playerA, lMiss, 1);
assertPowerToughness(playerA, cFeeder, 2, 2);
}
@Test
public void testNotReturnAttachedToBattlefieldAfterZoneChange() {
addCard(Zone.BATTLEFIELD, playerA, rOrb);
addCard(Zone.BATTLEFIELD, playerA, lMiss);
addCard(Zone.BATTLEFIELD, playerA, cFeeder);
addCard(Zone.BATTLEFIELD, playerA, "Wastes", 4);
addCard(Zone.BATTLEFIELD, playerB, "Crypt Creeper");
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", lMiss);
waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Sacrifice");
setChoice(playerA, lMiss);
activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Sacrifice");
addTarget(playerB, lMiss);
setStrictChooseMode(true);
setStopAt(2, PhaseStep.UPKEEP);
execute();
assertLife(playerA, 20);
assertExileCount(playerA, lMiss, 1);
assertPowerToughness(playerA, cFeeder, 2, 2);
assertGraveyardCount(playerB, "Crypt Creeper", 1);
}
}

14
Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlAttachedEffect.java
View file

@ -45,16 +45,14 @@ public class ReturnToBattlefieldUnderOwnerControlAttachedEffect extends OneShotE
if (controller == null) {
return false;
}
Object object = getValue("attachedTo");
if (object instanceof Permanent) {
Card card = game.getCard(((Permanent) object).getId());
if (card != null) {
if (controller.moveCards(card, Zone.BATTLEFIELD, source, game, this.tapped, false, true, null)) {
return true;
}
Object attached = getValue("attachedTo");
Object zcc = getValue("zcc");
if (attached instanceof Permanent && zcc instanceof Integer) {
Card card = game.getCard(((Permanent) attached).getId());
if (card != null && (int) zcc == card.getZoneChangeCounter(game)) {
return controller.moveCards(card, Zone.BATTLEFIELD, source, game, this.tapped, false, true, null);
}
}
return false;
}
}