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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-11-04 18:20:35 +01:00
commit a5e80d66f1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -1751,7 +1751,9 @@ public abstract class PlayerImpl implements Player, Serializable {
if (!game.isSimulation()) { if (!game.isSimulation()) {
game.informPlayers(this.getLogName() + " loses " + event.getAmount() + " life"); game.informPlayers(this.getLogName() + " loses " + event.getAmount() + " life");
} }
if (amount > 0) {
game.fireEvent(new GameEvent(GameEvent.EventType.LOST_LIFE, playerId, playerId, playerId, amount, atCombat)); game.fireEvent(new GameEvent(GameEvent.EventType.LOST_LIFE, playerId, playerId, playerId, amount, atCombat));
}
return amount; return amount;
} }
return 0; return 0;