github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source 
Conflicts:
	Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java
This commit is contained in:
LevelX2 2015-04-03 16:53:50 +02:00
parent 37a0c321b6
commit 1c085b30e2
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/abilities/AbilityImpl.java
View file

@ -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 (getTargets().size() > 0 && getTargets().chooseTargets(getEffects().get(0).getOutcome(), this.controllerId, this, game) == false) {
if ((variableManaCost != null || announceString != null) && !game.isSimulation()) { 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()); 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 return false; // when activation of ability is canceled during target selection
} }
} // end modes } // end modes

7
Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java
View file

@ -106,9 +106,10 @@ public class ReturnFromExileForSourceEffect extends OneShotEffect {
if (card == null) { if (card == null) {
return false; return false;
} }
if (!game.isSimulation()) if (!game.isSimulation()) {
game.informPlayers(controller.getName() + " moves " + card.getLogName() + " from exile to " + zone.toString().toLowerCase()); game.informPlayers(controller.getName() + " moves " + card.getLogName() + " from exile to " + returnToZone.toString().toLowerCase());
card.moveToZone(zone, source.getSourceId(), game, tapped); }
card.moveToZone(returnToZone, source.getSourceId(), game, tapped);
} }
exile.clear(); exile.clear();
} }