From 62aed496cc39fd19c82ff44156ab44bcf4cca976 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Sun, 28 Apr 2013 16:50:41 -0400
Subject: [PATCH] Fix issue with CombatTag NPC errors. Fixes #1012

NOTE: Do NOT change the default NPC name for CombatTag in your config,
or this fix won't work.
---
 src/main/java/com/gmail/nossr50/util/Misc.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/src/main/java/com/gmail/nossr50/util/Misc.java
index 3b47aa3ee..390a4bf8d 100644
--- a/src/main/java/com/gmail/nossr50/util/Misc.java
+++ b/src/main/java/com/gmail/nossr50/util/Misc.java
@@ -5,6 +5,7 @@ import java.util.Random;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -43,11 +44,7 @@ public final class Misc {
     }
 
     public static boolean isNPCEntity(Entity entity) {
-        if (entity == null || entity.hasMetadata("NPC")) {
-            return true;
-        }
-
-        return false;
+        return (entity == null || entity.hasMetadata("NPC") || (entity instanceof HumanEntity && ((HumanEntity) entity).getName().contains("PvpLogger")));
     }
 
     /**