Fix suicides counting towards playerkilling (closes #295)

1 files changed, 4 insertions, 7 deletions

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java
index adbf53c7..670b233f 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java
@@ -42,16 +42,13 @@ public final class PlayerkillingTaskType extends BukkitTaskType {
         Player killer = event.getEntity().getKiller();
         Entity mob = event.getEntity();
 
-        if (!(mob instanceof Player)) {
+        if (!(mob instanceof Player)
+            || killer == null
+            || killer.hasMetadata("NPC")
+            || mob == killer) {
             return;
         }
 
-        if (killer == null) {
-            return;
-        }
-
-        if (killer.hasMetadata("NPC")) return;
-
         QPlayer qPlayer = plugin.getPlayerManager().getPlayer(killer.getUniqueId());
         if (qPlayer == null) {
             return;