Merge origin/master

Conflicts:
	Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java
This commit is contained in:
LevelX2 2015-04-03 16:53:09 +02:00
commit 37a0c321b6
235 changed files with 10466 additions and 788 deletions

View file

@ -208,7 +208,8 @@ public class Spell implements StackObject, Card {
return result;
}
//20091005 - 608.2b
game.informPlayers(getName() + " has been fizzled.");
if (!game.isSimulation())
game.informPlayers(getName() + " has been fizzled.");
counter(null, game);
return false;
} else if (this.getCardType().contains(CardType.ENCHANTMENT) && this.getSubtype().contains("Aura")) {
@ -249,7 +250,8 @@ public class Spell implements StackObject, Card {
return result;
} else {
//20091005 - 608.2b
game.informPlayers(getName() + " has been fizzled.");
if (!game.isSimulation())
game.informPlayers(getName() + " has been fizzled.");
counter(null, game);
return false;
}
@ -400,7 +402,7 @@ public class Spell implements StackObject, Card {
}
}
if (newTargetDescription.length() > 0) {
if (newTargetDescription.length() > 0 && !game.isSimulation()) {
game.informPlayers(this.getName() + " is now " + newTargetDescription.toString());
}
return true;
@ -431,7 +433,7 @@ public class Spell implements StackObject, Card {
if (forceChange && target.possibleTargets(this.getSourceId(), getControllerId(), game).size() > 1) { // controller of spell must be used (e.g. TargetOpponent)
int iteration = 0;
do {
if (iteration > 0) {
if (iteration > 0 && !game.isSimulation()) {
game.informPlayer(player, "You may only select exactly one target that must be different from the origin target!");
}
iteration++;