From b6a66f1aba9965e47d29635f03145e4a303abf4f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 6 Feb 2017 22:02:44 +0100 Subject: [PATCH] Fixed syntax error of cascadeAbility. --- .../abilities/keyword/CascadeAbility.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java index 585dd5ec3fe..98ccd6a3db7 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java @@ -119,25 +119,26 @@ class CascadeEffect extends OneShotEffect { break; } 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 if (card != null) { - if (controller.chooseUse(outcome, "Use cascade effect on " + card.getLogName() + "?", source, game)) { + if (controller.chooseUse(outcome, "Use cascade effect on " + card.getLogName() + '?', source, game)) { controller.cast(card.getSpellAbility(), game, true); + } + // Move the remaining cards to the buttom of the library in a random order + Cards cardsFromExile = new CardsImpl(); + Cards cardsToLibrary = new CardsImpl(); + cardsFromExile.addAll(exile); + while (!cardsFromExile.isEmpty()) { + card = cardsFromExile.getRandom(game); + cardsFromExile.remove(card.getId()); + cardsToLibrary.add(card); + } + controller.putCardsOnBottomOfLibrary(cardsToLibrary, game, source, false); + } - // Move the remaining cards to the buttom of the library in a random order - Cards cardsFromExile = new CardsImpl(); - Cards cardsToLibrary = new CardsImpl(); - cardsFromExile.addAll(exile); - while (!cardsFromExile.isEmpty()) { - card = cardsFromExile.getRandom(game); - cardsFromExile.remove(card.getId()); - cardsToLibrary.add(card); - } - controller.putCardsOnBottomOfLibrary(cardsToLibrary, game, source, false); return true; }