Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-24 19:45:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix group lives; resolves #384 and resolves #440

Browse Source
This commit is contained in:
Daniel Saukel 2018-07-13 22:38:48 +02:00
parent 7c15214c87
commit 07b68397f3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/erethon/dungeonsxl/player/DGamePlayer.java
View File

@ -864,7 +864,8 @@ public class DGamePlayer extends DInstancePlayer {
} }
if (getDGroup() != null && dGroup.getLives() != -1) { if (getDGroup() != null && dGroup.getLives() != -1) {
dGroup.setLives(dGroup.getLives() - dPlayerDeathEvent.getLostLives()); int newLives = dGroup.getLives() - dPlayerDeathEvent.getLostLives();
dGroup.setLives(newLives < 0 ? 0 : newLives);// If the group already has 0 lives, don't remove any
gameWorld.sendMessage(DMessage.GROUP_DEATH.getMessage(getName(), dGroup.getName(), String.valueOf(dGroup.getLives()))); gameWorld.sendMessage(DMessage.GROUP_DEATH.getMessage(getName(), dGroup.getName(), String.valueOf(dGroup.getLives())));
} else { } else {