Fix IllegalArgumentException when player's health > 20
Merge remote-tracking branch 'upstream/master'