From e19172fb916dead150adb1663579df4be6e9a1e2 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 3 Oct 2016 00:38:39 +0200
Subject: [PATCH] [SWS] Fixed some problems.

---
 Mage.Sets/src/mage/sets/starwars/N1Starfighter.java         | 6 +++---
 .../mage/abilities/effects/common/UntapTargetEffect.java    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/starwars/N1Starfighter.java b/Mage.Sets/src/mage/sets/starwars/N1Starfighter.java
index 1a04f988a10..ba8c7894796 100644
--- a/Mage.Sets/src/mage/sets/starwars/N1Starfighter.java
+++ b/Mage.Sets/src/mage/sets/starwars/N1Starfighter.java
@@ -35,7 +35,7 @@ import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DoIfCostPaid;
 import mage.abilities.effects.common.ExileTargetForSourceEffect;
-import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect;
+import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect;
 import mage.abilities.keyword.SpaceflightAbility;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
@@ -67,8 +67,8 @@ public class N1Starfighter extends CardImpl {
         this.addAbility(SpaceflightAbility.getInstance());
 
         // Whenever N-1 Starfighter deals combat damage to a player, you may pay {1}. If you do, exile another creature you control, then return that card to the battlefield under its owner's control.
-        Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new ExileTargetForSourceEffect(), new GenericManaCost(1)), true);
-        Effect effect = new ReturnToBattlefieldUnderYourControlTargetEffect(true);
+        Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new ExileTargetForSourceEffect(), new GenericManaCost(1)), false);
+        Effect effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(false, true);
         effect.setText(", then return the card to the battlefield under their owner's control");
         ability.addEffect(effect);
         ability.addTarget(new TargetControlledCreaturePermanent(filter));
diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
index 6a87a049ea0..1347aeaeb15 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
@@ -35,6 +35,7 @@ import mage.constants.Outcome;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.Target;
+import mage.util.CardUtil;
 
 /**
  *
@@ -80,7 +81,7 @@ public class UntapTargetEffect extends OneShotEffect {
         }
 
         if (target.getMaxNumberOfTargets() > 1 || target.getNumberOfTargets() == 0) {
-            sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName()).append("s");
+            sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" target ").append(target.getTargetName()).append("s");
         } else {
             if (!target.getTargetName().startsWith("another")) {
                 sb.append("target ");