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

* Soulfire Grand Master - Fixed that delayed effects (e.g. Deflecting Palm) have also lifelink if Soulfire Grand Master is still on the battlefield.

Browse source
This commit is contained in:
LevelX2 2015-05-26 22:16:32 +02:00
parent 7b5b4928a4
commit f0ef479402
3 changed files with 73 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SoulfireGrandMasterTest.java
View file

@ -205,7 +205,7 @@ public class SoulfireGrandMasterTest extends CardTestPlayerBase {
}
/**
* Test that if Soulfire Grand Master has left the battlefield
* spell have no longer lifelink
* spell has no longer lifelink
*/
@Test
@ -294,5 +294,39 @@ public class SoulfireGrandMasterTest extends CardTestPlayerBase {
assertLife(playerB, 20);
assertLife(playerA, 20);
}
}
/**
* With a Soulfire Grand Master in play, Deflecting Palm doesn't gain the caster life.
* It should as it has lifelink, and it's Deflecting Palm (an instant) dealing damage.
* I was playing against a human in Standard Constructed.
*
*/
@Test
public void testWithDeflectingPalm() {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
// Instant -{R}{W}
// The next time a source of your choice would deal damage to you this turn, prevent that damage.
// If damage is prevented this way, Deflecting Palm deals that much damage to that source's controller.
addCard(Zone.HAND, playerA, "Deflecting Palm");
addCard(Zone.BATTLEFIELD, playerA, "Soulfire Grand Master", 1);
addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
addCard(Zone.HAND, playerB, "Lightning Bolt", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", playerA);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Deflecting Palm", null, "Lightning Bolt");
setChoice(playerA, "Lightning Bolt");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertGraveyardCount(playerB, "Lightning Bolt", 1);
assertGraveyardCount(playerA, "Deflecting Palm", 1);
assertLife(playerB, 17);
assertLife(playerA, 23); // damage is prevented + lifelink + 3
}
}

22
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -360,16 +360,24 @@ public class TestPlayer extends ComputerPlayer {
MageObject targetObject = game.getObject(targetId);
if (targetObject != null) {
for (String choose2: choices) {
if (targetObject.getName().equals(choose2)) {
List<UUID> alreadyTargetted = target.getTargets();
if (t.canTarget(targetObject.getId(), game)) {
if (alreadyTargetted != null && !alreadyTargetted.contains(targetObject.getId())) {
target.add(targetObject.getId(), game);
choices.remove(choose2);
return true;
String[] targetList = choose2.split("\\^");
boolean targetFound = false;
for (String targetName: targetList) {
if (targetObject.getName().equals(targetName)) {
List<UUID> alreadyTargetted = target.getTargets();
if (t.canTarget(targetObject.getId(), game)) {
if (alreadyTargetted != null && !alreadyTargetted.contains(targetObject.getId())) {
target.add(targetObject.getId(), game);
choices.remove(choose2);
targetFound = true;
}
}
}
}
if (targetFound) {
choices.remove(choose2);
return true;
}
}
}
}