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

* Living Death and Living End - Fixed a bug that wrongly all creatures were put onto battlefield under control of spell controller.

Browse source
This commit is contained in:
LevelX2 2014-11-05 15:23:59 +01:00
parent c02e5c8fbc
commit 8412515be0
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/sets/tempest/LivingDeath.java
View file

@ -106,7 +106,10 @@ class LivingDeathEffect extends OneShotEffect {
ExileZone exileZone = game.getState().getExile().getExileZone(source.getSourceId()); ExileZone exileZone = game.getState().getExile().getExileZone(source.getSourceId());
if (exileZone != null) { if (exileZone != null) {
for (Card card : exileZone.getCards(game)) { for (Card card : exileZone.getCards(game)) {
controller.putOntoBattlefieldWithInfo(card, game, Zone.EXILED, source.getSourceId()); Player player = game.getPlayer(card.getOwnerId());
if (player != null) {
player.putOntoBattlefieldWithInfo(card, game, Zone.EXILED, source.getSourceId());
}
} }
} }
return true; return true;

8
Mage.Sets/src/mage/sets/timespiral/LivingEnd.java
View file

@ -60,7 +60,8 @@ public class LivingEnd extends CardImpl {
// Suspend 3-{2}{B}{B} // Suspend 3-{2}{B}{B}
this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{2}{B}{B}"), this)); this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{2}{B}{B}"), this));
// Each player exiles all creature cards from his or her graveyard, then sacrifices all creatures he or she controls, then puts all cards he or she onto the battlefield. // Each player exiles all creature cards from his or her graveyard, then sacrifices all creatures
// he or she controls, then puts all cards he or she exiled this way onto the battlefield.
this.getSpellAbility().addEffect(new LivingEndEffect()); this.getSpellAbility().addEffect(new LivingEndEffect());
} }
@ -113,7 +114,10 @@ class LivingEndEffect extends OneShotEffect {
ExileZone exileZone = game.getState().getExile().getExileZone(source.getSourceId()); ExileZone exileZone = game.getState().getExile().getExileZone(source.getSourceId());
if (exileZone != null) { if (exileZone != null) {
for (Card card : exileZone.getCards(game)) { for (Card card : exileZone.getCards(game)) {
controller.putOntoBattlefieldWithInfo(card, game, Zone.EXILED, source.getSourceId()); Player player = game.getPlayer(card.getOwnerId());
if (player != null) {
player.putOntoBattlefieldWithInfo(card, game, Zone.EXILED, source.getSourceId());
}
} }
} }
return true; return true;