github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[STX] fixed Star Pupil not adding counters (fixes #7744)

Browse source
This commit is contained in:
Evan Kranzler 2021-04-15 09:45:12 -04:00
parent aea59275d9
commit 29f7555ac3
3 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/s/SpitefulSquad.java
View file

@ -75,7 +75,7 @@ class SpitefulSquadEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Permanent sourcePermanent = source.getSourcePermanentOrLKI(game); Permanent sourcePermanent = (Permanent) getValue("permanentLeftBattlefield");
Permanent permanent = game.getPermanent(source.getFirstTarget()); Permanent permanent = game.getPermanent(source.getFirstTarget());
if (sourcePermanent == null || permanent == null) { if (sourcePermanent == null || permanent == null) {
return false; return false;

2
Mage.Sets/src/mage/cards/s/StarPupil.java
View file

@ -71,7 +71,7 @@ class StarPupilEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Permanent sourcePermanent = source.getSourcePermanentOrLKI(game); Permanent sourcePermanent = (Permanent) getValue("permanentLeftBattlefield");
Permanent permanent = game.getPermanent(source.getFirstTarget()); Permanent permanent = game.getPermanent(source.getFirstTarget());
if (sourcePermanent == null || permanent == null) { if (sourcePermanent == null || permanent == null) {
return false; return false;

34
Mage.Tests/src/test/java/org/mage/test/cards/single/stx/StarPupilTest.java Normal file
View file

@ -0,0 +1,34 @@
package org.mage.test.cards.single.stx;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.counters.CounterType;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
* @author TheElk801
*/
public class StarPupilTest extends CardTestPlayerBase {
private static final String pupil = "Star Pupil";
private static final String murder = "Murder";
private static final String lion = "Silvercoat Lion";
@Test
public void testPupil() {
addCard(Zone.BATTLEFIELD, playerA, "Scrubland", 4);
addCard(Zone.BATTLEFIELD, playerA, lion);
addCard(Zone.HAND, playerA, pupil);
addCard(Zone.HAND, playerA, murder);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, pupil);
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, murder, pupil);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertAllCommandsUsed();
assertCounterCount(lion, CounterType.P1P1, 1);
}
}