From 747726a41f714a910b73e8371ed3885e05dc4562 Mon Sep 17 00:00:00 2001
From: LMBishop <13875753+LMBishop@users.noreply.github.com>
Date: Wed, 1 Dec 2021 04:01:19 +0000
Subject: Fix suicides counting towards playerkilling (closes #295)

---
 .../quests/bukkit/tasktype/type/PlayerkillingTaskType.java    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'bukkit/src/main/java')

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;
-- 
cgit v1.2.3-70-g09d2