diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-01-29 21:37:38 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-01-29 21:37:38 +0000 |
| commit | ae401f1fcaf63993b1b5c992a3eca20eadf220ac (patch) | |
| tree | 4420e59856da5ac0029f2efc139c068d505a49c8 | |
| parent | b5c50ed21949b995339ae8901d16525038f6f522 (diff) | |
| download | Essentials-ae401f1fcaf63993b1b5c992a3eca20eadf220ac.tar Essentials-ae401f1fcaf63993b1b5c992a3eca20eadf220ac.tar.gz Essentials-ae401f1fcaf63993b1b5c992a3eca20eadf220ac.tar.lz Essentials-ae401f1fcaf63993b1b5c992a3eca20eadf220ac.tar.xz Essentials-ae401f1fcaf63993b1b5c992a3eca20eadf220ac.zip | |
Fixing Kill/suicide in creative mode.
| -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())); } |