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

Fixed merge conflict

Browse source
This commit is contained in:
vraskulin 2017-02-06 14:36:09 +03:00
parent 0557b5e89c
commit 076045d862
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java
View file

@ -44,16 +44,14 @@ import mage.game.stack.Spell;
import mage.players.Player; import mage.players.Player;
/** /**
*
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class CascadeAbility extends TriggeredAbilityImpl { public class CascadeAbility extends TriggeredAbilityImpl {
//20091005 - 702.82 //20091005 - 702.82
private boolean withReminder;
private final static String reminderText = " <i>(When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less." private final static String reminderText = " <i>(When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less."
+ " You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)</i>"; + " You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)</i>";
private boolean withReminder;
public CascadeAbility() { public CascadeAbility() {
this(true); this(true);
@ -121,7 +119,8 @@ class CascadeEffect extends OneShotEffect {
break; break;
} }
controller.moveCardsToExile(card, source, game, true, exile.getId(), exile.getName()); controller.moveCardsToExile(card, source, game, true, exile.getId(), exile.getName());
} while (controller.isInGame() && (card.getCardType().contains(CardType.LAND) || !cardThatCostsLess(sourceCost, card, game))); }
while (controller.isInGame() && (card.getCardType().contains(CardType.LAND) || !cardThatCostsLess(sourceCost, card, game)));
controller.getLibrary().reset(); // set back empty draw state if that caused an empty draw controller.getLibrary().reset(); // set back empty draw state if that caused an empty draw