From 219cfdc583e275fcecc038ad965b5ae7e79ad826 Mon Sep 17 00:00:00 2001 From: Andre Cabaca Date: Fri, 21 Aug 2020 12:41:27 +0100 Subject: [PATCH] Fixed BarrinTolarianArchmage oracle in #6643 Fixed all the "return up to one (...) to **their** owners and" to "return up to one (...) to **its** owners and" found in cards like Teferi Time Raveler or Barrin Tolarian Archmage Signed-off-by: Andre Cabaca --- .../src/mage/cards/b/BarrinTolarianArchmage.java | 2 +- .../effects/common/ReturnToHandTargetEffect.java | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java b/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java index 7bdf6f46fda..840a3a3efc7 100644 --- a/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java +++ b/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java @@ -29,7 +29,7 @@ import java.util.UUID; public final class BarrinTolarianArchmage extends CardImpl { private static final FilterCreatureOrPlaneswalkerPermanent filter - = new FilterCreatureOrPlaneswalkerPermanent("other target creature or planeswalker"); + = new FilterCreatureOrPlaneswalkerPermanent(" other target creature or planeswalker"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java index 6f932960ff0..e5f2e70597b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java @@ -90,15 +90,13 @@ public class ReturnToHandTargetEffect extends OneShotEffect { } Target target = mode.getTargets().get(0); StringBuilder sb = new StringBuilder("return "); - if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) { + if (target.getMinNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) { sb.append("up to "); sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())); if (!target.getTargetName().contains("target")) { sb.append(" target "); } sb.append(target.getTargetName()); - sb.append(" to their owners' hand"); - return sb.toString(); } else { if (target.getNumberOfTargets() > 1) { sb.append(CardUtil.numberToText(target.getNumberOfTargets())).append(' '); @@ -106,9 +104,14 @@ public class ReturnToHandTargetEffect extends OneShotEffect { if (!target.getTargetName().startsWith("another")) { sb.append("target "); } - sb.append(target.getTargetName()).append(" to its owner's hand"); - return sb.toString(); } + if(target.getMaxNumberOfTargets() > 1) { + sb.append(" to their owners' hand"); + } + else { + sb.append(target.getTargetName()).append(" to its owner's hand"); + } + return sb.toString(); } }