Some minor tooltip text fixes.

Mage.Sets/src/mage/sets/magicorigins/JaceTelepathUnbound.java

@@ -78,7 +78,9 @@ public class JaceTelepathUnbound extends CardImpl {
         this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(5)), false));
 
         // +1: Up to one target creature gets -2/-0 until your next turn.
-        Ability ability = new LoyaltyAbility(new BoostTargetEffect(-2, 0, Duration.UntilYourNextTurn), 1);
+        Effect effect = new BoostTargetEffect(-2, 0, Duration.UntilYourNextTurn);
+        effect.setText("Up to one target creature gets -2/-0 until your next turn");
+        Ability ability = new LoyaltyAbility(effect, 1);
         ability.addTarget(new TargetCreaturePermanent(0, 1));
         this.addAbility(ability);
 
@@ -205,7 +207,6 @@ class JaceTelepathUnboundReplacementEffect extends ReplacementEffectImpl {
 class JaceTelepathUnboundEmblem extends Emblem {
 
     //  You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard".
-
     public JaceTelepathUnboundEmblem() {
         this.setName("Emblem - Jace");
         Effect effect = new PutTopCardOfLibraryIntoGraveTargetEffect(5);

Mage.Tests/src/test/java/org/mage/test/cards/replacement/ZoneChangeReplacementTest.java

@@ -25,11 +25,11 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package org.mage.test.cards.replacement;
 
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
+import mage.counters.CounterType;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
@@ -38,7 +38,6 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
  *
  * @author LevelX2
  */
-
 public class ZoneChangeReplacementTest extends CardTestPlayerBase {
 
     // If Darksteel Colossus would be put into a graveyard from anywhere,
@@ -132,8 +131,6 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase {
 
     // Have Progenitus and Humility on the battlefield. Destroy Progenitus. Progenitus should go to the graveyard
     // since it doesn't have any replacement effect. Currently, it gets shuffled into the library.
-
-
     @Test
     public void testHumilityDeactivatesReplacementEffectAbilities() {
         // Protection from everything
@@ -158,7 +155,6 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase {
         assertGraveyardCount(playerA, "Progenitus", 1);
         assertGraveyardCount(playerA, 2); // Diabolic Edict + Progenitus
 
-        
     }
 
     @Test
@@ -200,10 +196,8 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase {
 
     }
 
-
     // A creature gets damage from Kumano's Pupils and is destroyed after.
     // The creature has to go to exile.
-
     @Test
     public void testCreatureGetsExiledByKumano() {
         // 3/3
@@ -237,12 +231,9 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase {
 
     }
 
-
-
     // A creature gets damage from Kumano's Pupils and returns to hand after.
     // Then it's cast again. This new permanent instance is destroyed. It may not
     // got to exile because only previous instance was damgaged by Kumano's Pupils.
-
     @Test
     public void testPermanentNewInstanceAndKumano() {
         // 3/3
@@ -262,7 +253,6 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
         addCard(Zone.BATTLEFIELD, playerB, "Plains", 4);
 
-
         attack(2, playerB, "Pillarfield Ox");
         block(2, playerA, "Kumano's Pupils", "Pillarfield Ox");
 
@@ -286,11 +276,11 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase {
         assertGraveyardCount(playerB, "Pillarfield Ox", 1);
 
     }
+
     /**
      * Test that a countered spell of a card that goes always to library back
      * instead of into the graveyard.
      */
-
     @Test
     public void testCounterAndMoveToLibrary() {
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 7);
@@ -325,10 +315,9 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase {
     }
 
     /**
-   * Test that a returned creature of Whip of Erebos
-   * got exiled if it is destroyed by a spell
+     * Test that a returned creature of Whip of Erebos got exiled if it is
+     * destroyed by a spell
      */
-
     @Test
     public void testWhipOfErebos() {
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
@@ -357,7 +346,40 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase {
 
     }
 
+    /**
+     * Jace, Vryn’s Prodigy – Jace, Telepath Unbound
+     *
+     * You can't whip him back with Whip of Erebos , flip him and then keep him.
+     * I think he is considered a new object after being exiled by his own
+     * trigger, so whip shouldn't affect him anymore.
+     */
+    @Test
+    public void testWhipOfErebosTransformPlaneswalker() {
+        // {2}{B}{B}, {T}: Return target creature card from your graveyard to the battlefield.
+        // It gains haste. Exile it at the beginning of the next end step.
+        // If it would leave the battlefield, exile it instead of putting it anywhere else.
+        // Activate this ability only any time you could cast a sorcery.
+        addCard(Zone.BATTLEFIELD, playerB, "Whip of Erebos");
+        addCard(Zone.BATTLEFIELD, playerB, "Swamp", 4);
+        addCard(Zone.GRAVEYARD, playerB, "Swamp", 5);
+        addCard(Zone.GRAVEYARD, playerB, "Jace, Vryn's Prodigy");
 
+        activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{2}{B}{B},{T}: Return target creature", "Jace, Vryn's Prodigy");
+
+        // {T}: Draw a card, then discard a card. If there are five or more cards in your graveyard, exile Jace, Vryn's Prodigy, then return him to the battefield transformed under his owner's control.
+        activateAbility(2, PhaseStep.BEGIN_COMBAT, playerB, "{T}: Draw a card, then discard a card. If there are five or more cards in your graveyard");
+
+        activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "+1: Up to one target creature gets -2/-0 until your next turn");
+        setStopAt(3, PhaseStep.UNTAP);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+
+        assertPermanentCount(playerB, "Jace, Vryn's Prodigy", 0);
+        assertPermanentCount(playerB, "Jace, Telepath Unbound", 1);
+        assertCounterCount("Jace, Telepath Unbound", CounterType.LOYALTY, 6);
 
     }
 
+}

Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.abilities.effects.common;
 
 import mage.abilities.Ability;