External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Added test.

Browse source
This commit is contained in:
ludwig.hirth 2016-12-29 17:05:32 +01:00
parent b26a5730fa
commit 6c72794859
2 changed files with 42 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,24 +107,24 @@ class CascadeEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Card card;
Player player = game.getPlayer(source.getControllerId());
if (player == null) {
Player controller = game.getPlayer(source.getControllerId());
if (controller == null) {
return false;
}
ExileZone exile = game.getExile().createZone(source.getSourceId(), player.getName() + " Cascade");
ExileZone exile = game.getExile().createZone(source.getSourceId(), controller.getName() + " Cascade");
int sourceCost = game.getCard(source.getSourceId()).getConvertedManaCost();
do {
card = player.getLibrary().getFromTop(game);
card = controller.getLibrary().getFromTop(game);
if (card == null) {
break;
}
player.moveCardsToExile(card, source, game, true, exile.getId(), exile.getName());
} while (player.isInGame() && card.getCardType().contains(CardType.LAND) || card.getConvertedManaCost() >= sourceCost);
player.getLibrary().reset();
controller.moveCardsToExile(card, source, game, true, exile.getId(), exile.getName());
} while (controller.isInGame() && card.getCardType().contains(CardType.LAND) || card.getConvertedManaCost() >= sourceCost);
controller.getLibrary().reset(); // set back empty draw state if that caused an empty draw
if (card != null) {
if (player.chooseUse(outcome, "Use cascade effect on " + card.getLogName() + "?", source, game)) {
if (player.cast(card.getSpellAbility(), game, true)) {
if (controller.chooseUse(outcome, "Use cascade effect on " + card.getLogName() + "?", source, game)) {
if (controller.cast(card.getSpellAbility(), game, true)) {
exile.remove(card.getId());
}
}
@ -138,7 +138,7 @@ class CascadeEffect extends OneShotEffect {
cardsFromExile.remove(card.getId());
cardsToLibrary.add(card);
}
player.putCardsOnBottomOfLibrary(cardsToLibrary, game, source, false);
controller.putCardsOnBottomOfLibrary(cardsToLibrary, game, source, false);
return true;
}