* Some fixes to the exile effects with duration. Fixed that exiled cards/permanets did not come back if causing card was put into play and exiled by Whip of Erebos.

Mage/src/mage/abilities/TriggeredAbilities.java

@@ -85,7 +85,7 @@ public class TriggeredAbilities extends ConcurrentHashMap<String, TriggeredAbili
                                 ability.setControllerId(((Permanent) object).getControllerId());
                             }
                             ability.setSourceObject(object);
-                            if (ability.checkTrigger(event, game)) {
+                                if (ability.checkTrigger(event, game)) {
                                 UUID controllerId = ability.getControllerId();
                                 ability.trigger(game, controllerId);
                             }

Mage/src/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java

@@ -0,0 +1,121 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.abilities.common.delayed;
+
+import java.util.LinkedList;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.DelayedTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.game.ExileZone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.ZoneChangeEvent;
+import mage.players.Player;
+import mage.util.CardUtil;
+
+/**
+ *
+ * Returns the exiled cards/permanents as source leaves battlefield
+ *
+ * Uses no stack
+ * @author LevelX2
+ */
+
+public class OnLeaveReturnExiledToBattlefieldAbility extends DelayedTriggeredAbility {
+
+    public OnLeaveReturnExiledToBattlefieldAbility() {
+        super(new ReturnExiledPermanentsEffect(), Duration.OneUse);
+        this.usesStack = false;
+        this.setRuleVisible(false);
+    }
+
+    public OnLeaveReturnExiledToBattlefieldAbility(final OnLeaveReturnExiledToBattlefieldAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public OnLeaveReturnExiledToBattlefieldAbility copy() {
+        return new OnLeaveReturnExiledToBattlefieldAbility(this);
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId())) {
+            ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
+            if (zEvent.getFromZone() == Zone.BATTLEFIELD) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
+
+class ReturnExiledPermanentsEffect extends OneShotEffect {
+
+    public ReturnExiledPermanentsEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "Return exiled permanents";
+    }
+
+    public ReturnExiledPermanentsEffect(final ReturnExiledPermanentsEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ReturnExiledPermanentsEffect copy() {
+        return new ReturnExiledPermanentsEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller != null) {
+            ExileZone exile = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source));
+            if (exile != null) {
+                LinkedList<UUID> cards = new LinkedList<>(exile);
+                for (UUID cardId : cards) {
+                    Card card = game.getCard(cardId);
+                    if (card != null) {
+                        Player owner = game.getPlayer(card.getOwnerId());
+                        if (owner != null && owner.isInGame()) {
+                            owner.putOntoBattlefieldWithInfo(card, game, Zone.EXILED, source.getSourceId());
+                        }
+                    }
+                }
+                exile.clear();
+                return true;
+            }
+        }
+        return false;
+    }
+}

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

@@ -85,7 +85,11 @@ public class CreateDelayedTriggeredAbilityEffect extends OneShotEffect {
         if (staticText != null && !staticText.isEmpty()){
             return staticText;
         }
-        return ability.getRule();
+        if (ability.getRuleVisible()) {
+            return ability.getRule();
+        } else {
+            return "";
+        }
     }
 
 }

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

@@ -67,17 +67,18 @@ public class ExileSourceEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        if (!game.getState().getZone(source.getSourceId()).match(onlyfromZone)) {
+        Zone zone = game.getState().getZone(source.getSourceId());
+        if (!zone.match(onlyfromZone)) {
             return false;
         }
         Permanent permanent = game.getPermanent(source.getSourceId());
         Player controller = game.getPlayer(source.getControllerId());
         if (permanent != null) {
-            return controller.moveCardToExileWithInfo(permanent, null, null, source.getSourceId(), game, null);
+            return controller.moveCardToExileWithInfo(permanent, null, null, source.getSourceId(), game, zone);
         } else {
             Card card = game.getCard(source.getSourceId());
             if (card != null) {
-                return controller.moveCardToExileWithInfo(card, null, null, source.getSourceId(), game, null);
+                return controller.moveCardToExileWithInfo(card, null, null, source.getSourceId(), game, zone);
             }
         }
         return false;