From 7d6714f71380cb858e9eb6c77d0893da1a4b9906 Mon Sep 17 00:00:00 2001
From: ShadowRanger <shadowranger@users.noreply.github.com>
Date: Mon, 28 Sep 2015 11:45:25 +1000
Subject: [PATCH] Properly apply damage causes

---
 Essentials/src/com/earth2me/essentials/commands/Commandkill.java | 1 +
 .../src/com/earth2me/essentials/commands/Commandsuicide.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
index 0409208b8..efaaaa504 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkill.java
@@ -34,6 +34,7 @@ public class Commandkill extends EssentialsLoopCommand {
         if (ede.isCancelled() && sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.kill.force")) {
             return;
         }
+        ede.getEntity().setLastDamageCause(ede);
         matchPlayer.damage(Short.MAX_VALUE);
 
         if (matchPlayer.getHealth() > 0) {
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
index 414ee7b72..e9b13849d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
@@ -16,6 +16,7 @@ public class Commandsuicide extends EssentialsCommand {
     public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
         EntityDamageEvent ede = new EntityDamageEvent(user.getBase(), EntityDamageEvent.DamageCause.SUICIDE, Short.MAX_VALUE);
         server.getPluginManager().callEvent(ede);
+        ede.getEntity().setLastDamageCause(ede);
         user.getBase().damage(Short.MAX_VALUE);
         if (user.getBase().getHealth() > 0) {
             user.getBase().setHealth(0);