From 531577890d148f3ee74d01f99627f4ac36a9c39c Mon Sep 17 00:00:00 2001
From: Neil Gentleman <ngentleman@gmail.com>
Date: Sat, 5 Nov 2016 10:27:38 -0700
Subject: [PATCH] ReturnToHandChosenControlledPermanentCost: fix text for n > 1
---
Mage.Sets/src/mage/cards/e/Ensnare.java | 2 +-
Mage.Sets/src/mage/cards/g/Gush.java | 2 +-
Mage.Sets/src/mage/cards/t/Thwart.java | 2 +-
.../common/ReturnToHandChosenControlledPermanentCost.java | 5 +++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Mage.Sets/src/mage/cards/e/Ensnare.java b/Mage.Sets/src/mage/cards/e/Ensnare.java
index 1439c62106..1d3d12301b 100644
--- a/Mage.Sets/src/mage/cards/e/Ensnare.java
+++ b/Mage.Sets/src/mage/cards/e/Ensnare.java
@@ -59,7 +59,7 @@ public class Ensnare extends CardImpl {
this.addAbility(ability);
// Tap all creatures.
- this.getSpellAbility().addEffect(new TapAllEffect(new FilterCreaturePermanent()));
+ this.getSpellAbility().addEffect(new TapAllEffect(new FilterCreaturePermanent("creatures")));
}
public Ensnare(final Ensnare card) {
diff --git a/Mage.Sets/src/mage/cards/g/Gush.java b/Mage.Sets/src/mage/cards/g/Gush.java
index 708a209cad..ce5dc9b075 100644
--- a/Mage.Sets/src/mage/cards/g/Gush.java
+++ b/Mage.Sets/src/mage/cards/g/Gush.java
@@ -44,7 +44,7 @@ import mage.target.common.TargetControlledPermanent;
*/
public class Gush extends CardImpl {
- private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Island");
+ private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Islands");
static{
filter.add(new SubtypePredicate("Island"));
}
diff --git a/Mage.Sets/src/mage/cards/t/Thwart.java b/Mage.Sets/src/mage/cards/t/Thwart.java
index 1febc6e133..f57fc2d2d6 100644
--- a/Mage.Sets/src/mage/cards/t/Thwart.java
+++ b/Mage.Sets/src/mage/cards/t/Thwart.java
@@ -44,7 +44,7 @@ import mage.target.common.TargetControlledPermanent;
* @author markedagain
*/
public class Thwart extends CardImpl {
- private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Island");
+ private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Islands");
static{
filter.add(new SubtypePredicate("Island"));
}
diff --git a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java
index 7045e9dfeb..a0144cb7ec 100644
--- a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java
+++ b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java
@@ -40,6 +40,7 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetControlledPermanent;
+import mage.util.CardUtil;
/**
*
@@ -51,9 +52,9 @@ public class ReturnToHandChosenControlledPermanentCost extends CostImpl {
target.setNotTarget(true);
this.addTarget(target);
if (target.getMaxNumberOfTargets() > 1 && target.getMaxNumberOfTargets() == target.getNumberOfTargets()) {
- this.text = new StringBuilder("return ").append(target.getMaxNumberOfTargets()).append(" ").append(target.getTargetName()).append(" you control to its owner's hand").toString();
+ this.text = "return " + CardUtil.numberToText(target.getMaxNumberOfTargets()) + " " + target.getTargetName() + " you control to their owner's hand";
} else {
- this.text = new StringBuilder("return ").append(target.getTargetName()).append(" you control to its owner's hand").toString();
+ this.text = "return " + target.getTargetName() + " you control to its owner's hand";
}
}