Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

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:09 +02:00
commit 37a0c321b6
235 changed files with 10466 additions and 788 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/abilities/effects/ContinuousEffects.java
View file

@ -670,11 +670,11 @@ public class ContinuousEffects implements Serializable {
if (message != null && !message.isEmpty()) {
if (effect.sendMessageToUser()) {
Player player = game.getPlayer(event.getPlayerId());
if (player != null) {
if (player != null && !game.isSimulation()) {
game.informPlayer(player, message);
}
}
if (effect.sendMessageToGameLog()) {
if (effect.sendMessageToGameLog() && !game.isSimulation()) {
game.informPlayers(message);
}
}