From a31f5e219d3a2803bed94c747e74bf59acddf7f1 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 29 Jan 2012 03:22:52 +0000 Subject: Kill people the proper way. Test #1410 --- Essentials/src/com/earth2me/essentials/commands/Commandkill.java | 2 +- .../src/com/earth2me/essentials/commands/Commandsuicide.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java index e56f9d67b..c23161c0e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java @@ -31,7 +31,7 @@ public class Commandkill extends EssentialsCommand continue; } - matchPlayer.setHealth(0); + matchPlayer.damage(1000); 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 aa2ed5567..6ccb3f7b6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java @@ -3,6 +3,7 @@ package com.earth2me.essentials.commands; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.User; import org.bukkit.Server; +import org.bukkit.event.entity.EntityDamageEvent; public class Commandsuicide extends EssentialsCommand @@ -15,9 +16,10 @@ public class Commandsuicide extends EssentialsCommand @Override public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - user.setHealth(0); + EntityDamageEvent ede = new EntityDamageEvent(user, EntityDamageEvent.DamageCause.SUICIDE, 1000); + server.getPluginManager().callEvent(ede); + user.damage(1000); user.sendMessage(_("suicideMessage")); - ess.broadcastMessage(user, - _("suicideSuccess", user.getDisplayName())); + ess.broadcastMessage(user,_("suicideSuccess", user.getDisplayName())); } } -- cgit v1.2.3