1 files changed, 9 insertions, 2 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java
index ab53e5a2..e38cc01f 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java
@@ -63,8 +63,15 @@ public final class MobkillingTaskType extends BukkitTaskType {
         @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
         public void onEntityDeath(EntityDeathEvent event) {
             LivingEntity entity = event.getEntity();
-            EntityDamageEvent damageEvent = entity.getLastDamageCause();
-            Player player = plugin.getVersionSpecificHandler().getDamager(damageEvent);
+            Player killer = entity.getKiller();
+            Player player;
+
+            if (killer != null) {
+                player = killer;
+            } else {
+                EntityDamageEvent damageEvent = entity.getLastDamageCause();
+                player = plugin.getVersionSpecificHandler().getDamager(damageEvent);
+            }
 
             handle(player, entity, 1);
         }