From 09827e1e11ae328fe539384309a7a507f3e5480d Mon Sep 17 00:00:00 2001 From: Jeff Date: Tue, 11 Dec 2018 17:54:35 -0600 Subject: [PATCH] - Fixed #5457 --- Mage.Sets/src/mage/cards/h/HeraldsHorn.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/cards/h/HeraldsHorn.java b/Mage.Sets/src/mage/cards/h/HeraldsHorn.java index 1dfbd2b6ec..f95458daed 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldsHorn.java +++ b/Mage.Sets/src/mage/cards/h/HeraldsHorn.java @@ -13,10 +13,11 @@ import mage.abilities.effects.common.cost.SpellsCostReductionAllOfChosenSubtypeE import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.ChosenSubtypePredicate; +import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -79,15 +80,18 @@ class HeraldsHornEffect extends OneShotEffect { // If it's a creature card of the chosen type, you may reveal it and put it into your hand. FilterCreatureCard filter = new FilterCreatureCard("creature card of the chosen type"); - filter.add(new ChosenSubtypePredicate()); + SubType subtype = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game); + filter.add(new SubtypePredicate(subtype)); String message = "Reveal the top card of your library and put that card into your hand?"; if (card != null) { - if (filter.match(card, game) && controller.chooseUse(Outcome.Benefit, message, source, game)) { + if (filter.match(card, game) + && controller.chooseUse(Outcome.Benefit, message, source, game)) { controller.moveCards(card, Zone.HAND, source, game); controller.revealCards(sourceObject.getIdName() + " put into hand", cards, game); + return true; } } } - return true; + return false; } }