mirror of
https://github.com/correl/mage.git
synced 2024-12-25 03:00:15 +00:00
Merge origin/master
This commit is contained in:
commit
a5e80d66f1
1 changed files with 3 additions and 1 deletions
|
@ -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");
|
||||||
}
|
}
|
||||||
game.fireEvent(new GameEvent(GameEvent.EventType.LOST_LIFE, playerId, playerId, playerId, amount, atCombat));
|
if (amount > 0) {
|
||||||
|
game.fireEvent(new GameEvent(GameEvent.EventType.LOST_LIFE, playerId, playerId, playerId, amount, atCombat));
|
||||||
|
}
|
||||||
return amount;
|
return amount;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue