From 1c085b30e20e20310e7ede173f732f06aa20fc71 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 3 Apr 2015 16:53:50 +0200 Subject: [PATCH] Merge origin/master Conflicts: Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java --- Mage/src/mage/abilities/AbilityImpl.java | 2 +- .../effects/common/ReturnFromExileForSourceEffect.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java index 9a49dbe76cf..84fec853f2f 100644 --- a/Mage/src/mage/abilities/AbilityImpl.java +++ b/Mage/src/mage/abilities/AbilityImpl.java @@ -326,7 +326,7 @@ public abstract class AbilityImpl implements Ability { if (getTargets().size() > 0 && getTargets().chooseTargets(getEffects().get(0).getOutcome(), this.controllerId, this, game) == false) { if ((variableManaCost != null || announceString != null) && !game.isSimulation()) { game.informPlayer(controller, new StringBuilder(sourceObject != null ? sourceObject.getLogName(): "").append(": no valid targets with this value of X").toString()); - } + } return false; // when activation of ability is canceled during target selection } } // end modes diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java b/Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java index 278c4ddb89c..6b22884e07b 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java @@ -106,9 +106,10 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect { if (card == null) { return false; } - if (!game.isSimulation()) - game.informPlayers(controller.getName() + " moves " + card.getLogName() + " from exile to " + zone.toString().toLowerCase()); - card.moveToZone(zone, source.getSourceId(), game, tapped); + if (!game.isSimulation()) { + game.informPlayers(controller.getName() + " moves " + card.getLogName() + " from exile to " + returnToZone.toString().toLowerCase()); + } + card.moveToZone(returnToZone, source.getSourceId(), game, tapped); } exile.clear(); }