From 3bc28d63c378dd7126331cc68806b083b6f82cbb Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 9 Dec 2023 20:46:56 -0500 Subject: [PATCH] text fix --- Mage.Sets/src/mage/cards/n/NissaOfShadowedBoughs.java | 4 ++-- .../PutCardFromOneOfTwoZonesOntoBattlefieldEffect.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/n/NissaOfShadowedBoughs.java b/Mage.Sets/src/mage/cards/n/NissaOfShadowedBoughs.java index 69685415036..791b839364b 100644 --- a/Mage.Sets/src/mage/cards/n/NissaOfShadowedBoughs.java +++ b/Mage.Sets/src/mage/cards/n/NissaOfShadowedBoughs.java @@ -16,8 +16,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; -import mage.filter.FilterCard; import mage.filter.StaticFilters; +import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.card.CardManaCostLessThanControlledLandCountPredicate; import mage.game.Game; import mage.game.permanent.token.custom.CreatureToken; @@ -31,7 +31,7 @@ import java.util.UUID; */ public final class NissaOfShadowedBoughs extends CardImpl { - private static final FilterCard filter = new FilterCard("card with mana value less than or equal to the number of lands you control"); + private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with mana value less than or equal to the number of lands you control"); static { filter.add(CardManaCostLessThanControlledLandCountPredicate.getInstance()); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutCardFromOneOfTwoZonesOntoBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutCardFromOneOfTwoZonesOntoBattlefieldEffect.java index 3376fa56b99..e467c2cac2a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutCardFromOneOfTwoZonesOntoBattlefieldEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutCardFromOneOfTwoZonesOntoBattlefieldEffect.java @@ -11,7 +11,6 @@ import mage.constants.CommanderCardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; @@ -24,6 +23,7 @@ import mage.util.CardUtil; /** * "Put a {filter} card from {zone 1} or {zone 2} onto the battlefield. + * TODO: Refactor, see #11213 * * @author TheElk801, Alex-Vasile */ @@ -65,10 +65,6 @@ public class PutCardFromOneOfTwoZonesOntoBattlefieldEffect extends OneShotEffect this(filterCard, tapped, effectToApplyOnPermanent, Zone.HAND, Zone.GRAVEYARD); } - public PutCardFromOneOfTwoZonesOntoBattlefieldEffect(FilterCard filterCard, Zone zone1, Zone zone2) { - this(filterCard, false, null, zone1, zone2); - } - private PutCardFromOneOfTwoZonesOntoBattlefieldEffect(final PutCardFromOneOfTwoZonesOntoBattlefieldEffect effect) { super(effect); this.filterCard = effect.filterCard; @@ -156,6 +152,9 @@ public class PutCardFromOneOfTwoZonesOntoBattlefieldEffect extends OneShotEffect @Override public String getText(Mode mode) { + if (staticText != null && !staticText.isEmpty()) { + return staticText; + } return "you may put " + CardUtil.addArticle(this.filterCard.getMessage()) + " from your hand or graveyard onto the battlefield" + (this.tapped ? " tapped" : "") +