From e4d3cb5f4dfa2ad0da7fd50f9e11aef8815c6f7e Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Sun, 8 Jun 2014 18:11:18 +0200
Subject: [PATCH] Remove PvpLogger checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No longer needed when testing with Combat Tag v6.1.4, the NPCs have
metadata „NPC”.

Fixes #2017
---
 src/main/java/com/gmail/nossr50/mcMMO.java     | 6 ------
 src/main/java/com/gmail/nossr50/util/Misc.java | 3 +--
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index d8f39813d..f8e7ffb10 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -88,7 +88,6 @@ public class mcMMO extends JavaPlugin {
     private boolean updateAvailable;
 
     /* Plugin Checks */
-    private static boolean combatTagEnabled;
     private static boolean healthBarPluginEnabled;
 
     // Config Validation Check
@@ -127,7 +126,6 @@ public class mcMMO extends JavaPlugin {
             metadataValue = new FixedMetadataValue(this, true);
 
             PluginManager pluginManager = getServer().getPluginManager();
-            combatTagEnabled = pluginManager.getPlugin("CombatTag") != null;
             healthBarPluginEnabled = pluginManager.getPlugin("HealthBar") != null;
 
             setupFilePaths();
@@ -315,10 +313,6 @@ public class mcMMO extends JavaPlugin {
         mcMMO.databaseManager = databaseManager;
     }
 
-    public static boolean isCombatTagEnabled() {
-        return combatTagEnabled;
-    }
-
     public static boolean isHealthBarPluginEnabled() {
         return healthBarPluginEnabled;
     }
diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/src/main/java/com/gmail/nossr50/util/Misc.java
index 51eaeee13..1196fa63f 100644
--- a/src/main/java/com/gmail/nossr50/util/Misc.java
+++ b/src/main/java/com/gmail/nossr50/util/Misc.java
@@ -6,7 +6,6 @@ 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.NPC;
 import org.bukkit.entity.Player;
@@ -51,7 +50,7 @@ public final class Misc {
     }
 
     public static boolean isNPCEntity(Entity entity) {
-        return (entity == null || entity.hasMetadata("NPC") || entity instanceof NPC || (mcMMO.isCombatTagEnabled() && entity instanceof HumanEntity && ((HumanEntity) entity).getName().contains("PvpLogger")) || entity.getClass().getName().equalsIgnoreCase("cofh.entity.PlayerFake"));
+        return (entity == null || entity.hasMetadata("NPC") || entity instanceof NPC || entity.getClass().getName().equalsIgnoreCase("cofh.entity.PlayerFake"));
     }
 
     /**