github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Planar Guide - Fixed handling of exiling and returning the creatures in a not correct way (fixes #4740).

Browse source
This commit is contained in:
LevelX2 2018-04-10 17:58:33 +02:00
parent 9b0d130603
commit 2eeab42cfa
1 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
Mage.Sets/src/mage/cards/p/PlanarGuide.java
View file

@ -27,8 +27,10 @@
*/
package mage.cards.p;
import java.util.HashSet;
import java.util.UUID;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
@ -39,14 +41,13 @@ import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.StaticFilters;
import mage.game.ExileZone;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
/**
*
@ -80,15 +81,9 @@ public class PlanarGuide extends CardImpl {
class PlanarGuideExileEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterPermanent("all creatures");
static {
filter.add(new CardTypePredicate(CardType.CREATURE));
}
public PlanarGuideExileEffect() {
super(Outcome.Detriment);
staticText = "Exile all creatures. At the beginning of the next end step, return those cards to the battlefield under their owners' control.";
staticText = "Exile all creatures. At the beginning of the next end step, return those cards to the battlefield under their owners' control";
}
public PlanarGuideExileEffect(final PlanarGuideExileEffect effect) {
@ -97,21 +92,22 @@ class PlanarGuideExileEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
boolean creatureExiled = false;
for (Permanent creature : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
if (creature != null) {
if (creature.moveToExile(source.getSourceId(), "Planar Guide", source.getSourceId(), game)) {
creatureExiled = true;
}
MageObject sourceObject = game.getObject(source.getSourceId());
Player controller = game.getPlayer(source.getControllerId());
if (sourceObject != null && controller != null) {
HashSet<Card> toExile = new HashSet<>();
toExile.addAll(game.getBattlefield().getActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, source.getControllerId(), source.getSourceId(), game));
controller.moveCardsToExile(toExile, source, game, true, source.getSourceId(), sourceObject.getIdName());
ExileZone exile = game.getExile().getExileZone(source.getSourceId());
if (exile != null && !exile.isEmpty()) {
// Create delayed triggered ability
AtTheBeginOfNextEndStepDelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new PlanarGuideReturnFromExileEffect());
game.addDelayedTriggeredAbility(delayedAbility, source);
return true;
}
}
if (creatureExiled) {
// Create delayed triggered ability
AtTheBeginOfNextEndStepDelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new PlanarGuideReturnFromExileEffect());
game.addDelayedTriggeredAbility(delayedAbility, source);
return true;
}
return true;
return false;
}
@Override
@ -124,7 +120,7 @@ class PlanarGuideReturnFromExileEffect extends OneShotEffect {
public PlanarGuideReturnFromExileEffect() {
super(Outcome.PutCardInPlay);
staticText = "At the beginning of the next end step, return those cards to the battlefield under their owners' control.";
staticText = "At the beginning of the next end step, return those cards to the battlefield under their owners' control";
}
public PlanarGuideReturnFromExileEffect(final PlanarGuideReturnFromExileEffect effect) {
@ -138,14 +134,12 @@ class PlanarGuideReturnFromExileEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
ExileZone exile = game.getExile().getExileZone(source.getSourceId());
if (exile != null) {
exile = exile.copy();
for (UUID cardId : exile) {
Card card = game.getCard(cardId);
card.moveToZone(Zone.BATTLEFIELD, source.getSourceId(), game, false);
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
ExileZone exile = game.getExile().getExileZone(source.getSourceId());
if (exile != null) {
controller.moveCards(exile.copy(), Zone.BATTLEFIELD, source, game);
}
game.getExile().getExileZone(source.getSourceId()).clear();
return true;
}
return false;