diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-01-29 21:39:05 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-01-29 21:39:05 +0000 |
| commit | d8ac3587ac55a920547d2406853339116187ddc1 (patch) | |
| tree | 21aff467d1a4d950fbc0c0d2ba323e202fbe29c5 | |
| parent | 85c4fbdf4f95074e59ae816cd4a6860bc3cf85aa (diff) | |
| parent | a2418a68d919a959a4b3c4ccfaa66dd8d818bf6a (diff) | |
| download | Essentials-d8ac3587ac55a920547d2406853339116187ddc1.tar Essentials-d8ac3587ac55a920547d2406853339116187ddc1.tar.gz Essentials-d8ac3587ac55a920547d2406853339116187ddc1.tar.lz Essentials-d8ac3587ac55a920547d2406853339116187ddc1.tar.xz Essentials-d8ac3587ac55a920547d2406853339116187ddc1.zip | |
Merge branch 'master' into release
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandkill.java | 3 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java index c23161c0e..566cb69d5 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java @@ -31,7 +31,8 @@ public class Commandkill extends EssentialsCommand continue; } - matchPlayer.damage(1000); + matchPlayer.damage(1000); + matchPlayer.setHealth(0); sender.sendMessage(_("kill", matchPlayer.getDisplayName())); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java index 6ccb3f7b6..64f7fe04a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java @@ -19,6 +19,7 @@ public class Commandsuicide extends EssentialsCommand EntityDamageEvent ede = new EntityDamageEvent(user, EntityDamageEvent.DamageCause.SUICIDE, 1000); server.getPluginManager().callEvent(ede); user.damage(1000); + user.setHealth(0); user.sendMessage(_("suicideMessage")); ess.broadcastMessage(user,_("suicideSuccess", user.getDisplayName())); } |