From 15ce5c6ff2ee489bc6f9c597f7a590c70cf2d522 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 2 Apr 2015 23:53:38 +0200 Subject: [PATCH] * Rise // Fall - Fixed a bug that the discard of Fall did not work correctly. --- Mage.Sets/src/mage/sets/dissension/RiseFall.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Mage.Sets/src/mage/sets/dissension/RiseFall.java b/Mage.Sets/src/mage/sets/dissension/RiseFall.java index f226477df9c..e3624088060 100644 --- a/Mage.Sets/src/mage/sets/dissension/RiseFall.java +++ b/Mage.Sets/src/mage/sets/dissension/RiseFall.java @@ -57,24 +57,16 @@ public class RiseFall extends SplitCard { super(ownerId, 156, "Rise", "Fall", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{U}{B}","{B}{R}", false ); this.expansionSetCode = "DIS"; - this.color.setBlue(true); - this.color.setBlack(true); - this.color.setRed(true); - // Rise // Return target creature card from a graveyard and target creature on the battlefield to their owners' hands. getLeftHalfCard().getSpellAbility().addEffect(new RiseEffect()); getLeftHalfCard().getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); - getLeftHalfCard().getColor().setBlue(true); - getLeftHalfCard().getColor().setBlack(true); // Fall // Target player reveals two cards at random from his or her hand, then discards each nonland card revealed this way. getRightHalfCard().getSpellAbility().addEffect(new FallEffect()); getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer()); - getLeftHalfCard().getColor().setBlack(true); - getLeftHalfCard().getColor().setRed(true); } public RiseFall(final RiseFall card) { @@ -156,7 +148,7 @@ class FallEffect extends OneShotEffect { } targetPlayer.revealCards(sourceObject.getLogName(), cards, game); for (Card cardToDiscard: cards.getCards(game)) { - if (!card.getCardType().contains(CardType.LAND)) { + if (!cardToDiscard.getCardType().contains(CardType.LAND)) { targetPlayer.discard(cardToDiscard, source, game); } }