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

@ -100,7 +100,8 @@ public class StackAbility implements StackObject, Ability {
if (ability.getTargets().stillLegal(ability, game)) {
return ability.resolve(game);
}
game.informPlayers("Ability has been fizzled: " + getRule());
if (!game.isSimulation())
game.informPlayers("Ability has been fizzled: " + getRule());
counter(null, game);
return false;
}