summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-10-09 07:06:45 -0700
committersnowleo <schneeleo@gmail.com>2011-10-09 07:06:45 -0700
commit63e6bf8ff39ca5526aa37f9b94a9a00c65cb26a8 (patch)
tree10fac139736bbc4a696730b34fb0911e821bb7d3
parent359b22d4edfd7cc724fd08d430ac0474debf8e5e (diff)
parent9e97c93fa1c39406501c79aadc34848723ed0323 (diff)
downloadEssentials-63e6bf8ff39ca5526aa37f9b94a9a00c65cb26a8.tar
Essentials-63e6bf8ff39ca5526aa37f9b94a9a00c65cb26a8.tar.gz
Essentials-63e6bf8ff39ca5526aa37f9b94a9a00c65cb26a8.tar.lz
Essentials-63e6bf8ff39ca5526aa37f9b94a9a00c65cb26a8.tar.xz
Essentials-63e6bf8ff39ca5526aa37f9b94a9a00c65cb26a8.zip
Merge pull request #27 from feildmaster/patch-1
Fires an event before "killing."
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandkill.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
index 03afeadc4..0b403ca7d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
@@ -23,6 +23,10 @@ public class Commandkill extends EssentialsCommand
for (Player p : server.matchPlayer(args[0]))
{
+ EntityDamageEvent ede = new EntityDamageEvent(p, EntityDamageEvent.DamageCause.CUSTOM, 1000);
+ server.getPluginManager().callEvent(ede);
+ //if (ede.isCancelled()) return;
+
p.setHealth(0);
sender.sendMessage(Util.format("kill", p.getDisplayName()));
}