summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-10-20 19:10:51 +0100
committerKHobbits <rob@khobbits.co.uk>2012-10-20 19:18:04 +0100
commit5d42895173c3985a11c906ca8caa423f652bac4a (patch)
tree8ae3f0c90562d321e899d2fd659d680b905d2956
parent84f8ff055fcbd7eb1040c12f2c747d4e220810ef (diff)
downloadEssentials-5d42895173c3985a11c906ca8caa423f652bac4a.tar
Essentials-5d42895173c3985a11c906ca8caa423f652bac4a.tar.gz
Essentials-5d42895173c3985a11c906ca8caa423f652bac4a.tar.lz
Essentials-5d42895173c3985a11c906ca8caa423f652bac4a.tar.xz
Essentials-5d42895173c3985a11c906ca8caa423f652bac4a.zip
If the player is still alive, make sure he dies. (/kill)
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandkill.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
index a2e58227b..306bfd58e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
@@ -21,7 +21,7 @@ public class Commandkill extends EssentialsCommand
{
throw new NotEnoughArgumentsException();
}
-
+
//TODO: TL this
if (args[0].trim().length() < 2)
{
@@ -38,6 +38,12 @@ public class Commandkill extends EssentialsCommand
}
matchPlayer.damage(Short.MAX_VALUE);
+
+ if (matchPlayer.getHealth() > 0)
+ {
+ matchPlayer.setHealth(0);
+ }
+
sender.sendMessage(_("kill", matchPlayer.getDisplayName()));
}
}