summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-03-16 08:42:24 +0000
committerKHobbits <rob@khobbits.co.uk>2013-03-16 08:42:24 +0000
commit208d673c2b709cd374a85254b313a041d206a745 (patch)
treeba9aa29043dc508697854ce307a5798da1d45b9c
parent2b0506de77a136067f36be6b22cafbf4a21b1cd5 (diff)
downloadEssentials-208d673c2b709cd374a85254b313a041d206a745.tar
Essentials-208d673c2b709cd374a85254b313a041d206a745.tar.gz
Essentials-208d673c2b709cd374a85254b313a041d206a745.tar.lz
Essentials-208d673c2b709cd374a85254b313a041d206a745.tar.xz
Essentials-208d673c2b709cd374a85254b313a041d206a745.zip
Check health is 0 after /suicide
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
index 84c9fc489..6cae113d9 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
@@ -19,8 +19,12 @@ public class Commandsuicide extends EssentialsCommand
EntityDamageEvent ede = new EntityDamageEvent(user.getBase(), EntityDamageEvent.DamageCause.SUICIDE, Short.MAX_VALUE);
server.getPluginManager().callEvent(ede);
user.damage(Short.MAX_VALUE);
+ if (user.getHealth() > 0)
+ {
+ user.setHealth(0);
+ }
user.sendMessage(_("suicideMessage"));
user.setDisplayNick();
- ess.broadcastMessage(user,_("suicideSuccess", user.getDisplayName()));
+ ess.broadcastMessage(user, _("suicideSuccess", user.getDisplayName()));
}
}