From b217f86553e02a1fe55a856e4f8410f02905fce8 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 28 May 2018 14:18:23 -0400 Subject: [PATCH] Fixed Matter Reshaper not working --- .../src/mage/cards/m/MatterReshaper.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/cards/m/MatterReshaper.java b/Mage.Sets/src/mage/cards/m/MatterReshaper.java index e1e8536734f..3ece476ef72 100644 --- a/Mage.Sets/src/mage/cards/m/MatterReshaper.java +++ b/Mage.Sets/src/mage/cards/m/MatterReshaper.java @@ -91,17 +91,18 @@ class MatterReshaperEffect extends OneShotEffect { if (controller != null) { Card card = controller.getLibrary().getFromTop(game); if (card == null) { - controller.revealCards(source, new CardsImpl(card), game); - FilterPermanentCard filter = new FilterPermanentCard("permanent card with converted mana cost 3 or less"); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); - if (filter.match(card, game)) { - if (controller.chooseUse(Outcome.PutCardInPlay, "Put " + card.getName() + " onto the battlefield (otherwise put in hand)?", source, game)) { - controller.moveCards(card, Zone.BATTLEFIELD, source, game); - return true; - } - } - controller.moveCards(card, Zone.HAND, source, game); + return false; } + controller.revealCards(source, new CardsImpl(card), game); + FilterPermanentCard filter = new FilterPermanentCard("permanent card with converted mana cost 3 or less"); + filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); + if (filter.match(card, game)) { + if (controller.chooseUse(Outcome.PutCardInPlay, "Put " + card.getName() + " onto the battlefield (otherwise put in hand)?", source, game)) { + controller.moveCards(card, Zone.BATTLEFIELD, source, game); + return true; + } + } + controller.moveCards(card, Zone.HAND, source, game); return true; } return false;