External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 20:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attacking you abilities and filters - fixed that planeswalker removes from a combat can cause a game error (NPE error, example: Curse of Hospitality)

Browse source
This commit is contained in:
Oleg Agafonov 2023-05-09 14:59:44 +04:00
parent 1f4dfd08ce
commit 9d9916280a
9 changed files with 68 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Mage.Tests/src/test/java/org/mage/test/combat/RemoveFromCombatTest.java
View file

@ -1,4 +1,3 @@
package org.mage.test.combat;
import mage.constants.PhaseStep;
@ -9,8 +8,7 @@ import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
* @author LevelX2, JayDi85
*/
public class RemoveFromCombatTest extends CardTestPlayerBase {
@ -21,7 +19,7 @@ public class RemoveFromCombatTest extends CardTestPlayerBase {
* continued attacking and dealt 3 damage to me.
*/
@Test
public void testLeavesCombatIfNoLongerACreature() {
public void test_LeavesCombatIfNoLongerACreature() {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
addCard(Zone.HAND, playerA, "Lightning Blast", 1);
@ -51,7 +49,61 @@ public class RemoveFromCombatTest extends CardTestPlayerBase {
assertLife(playerA, 20);
assertLife(playerB, 20);
}
@Test
public void test_Defender_AttackPlayer() {
// Enchant player
// Creatures attacking enchanted player have trample.
addCard(Zone.HAND, playerA, "Curse of Hospitality", 1); // {2}{R}
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3);
//
addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears", 1);
addCard(Zone.BATTLEFIELD, playerB, "Alpha Myr", 1); // 2/1
// prepare
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Hospitality");
addTarget(playerA, playerB);
// attack and get trumple
attack(1, playerA, "Grizzly Bears");
block(1, playerB, "Alpha Myr", "Grizzly Bears");
setChoiceAmount(playerA, 1);
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertLife(playerB, 20 - 1); // must get 1 from trumple
}
@Test
public void test_Defender_AttackPlaneswalkerAndRemoveDefender() {
// possible bug: NPE error on defender remove from battle
// Enchant player
// Creatures attacking enchanted player have trample.
addCard(Zone.HAND, playerA, "Curse of Hospitality", 1); // {2}{R}
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3);
//
addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears", 1); // 2/2
addCard(Zone.BATTLEFIELD, playerA, "Adaptive Snapjaw", 1); // 6/2
addCard(Zone.BATTLEFIELD, playerB, "Jace, Memory Adept", 1); // 4
addCard(Zone.BATTLEFIELD, playerB, "Alpha Myr", 1); // 2/1
// prepare
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curse of Hospitality");
addTarget(playerA, playerB);
// attack planeswalker and remove it from battlefield due damage
attack(1, playerA, "Adaptive Snapjaw", "Jace, Memory Adept");
attack(1, playerA, "Grizzly Bears", playerB);
setStrictChooseMode(true);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertLife(playerB, 20 - 2);
assertGraveyardCount(playerB, "Jace, Memory Adept", 1);
}
}