# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
ninthworld 2018-07-20 22:11:49 -07:00
commit 8dfb5f913d

View file

@ -1853,7 +1853,7 @@ public abstract class PlayerImpl implements Player, Serializable {
@Override
public int loseLife(int amount, Game game, boolean atCombat) {
if (!canLoseLife) {
if (!canLoseLife || !this.isInGame()) {
return 0;
}
GameEvent event = new GameEvent(GameEvent.EventType.LOSE_LIFE, playerId, playerId, playerId, amount, atCombat);