From e0358d42d6177005ccff3ee2dc015bea60e10a17 Mon Sep 17 00:00:00 2001 From: GJ Date: Fri, 3 Jan 2014 09:19:07 -0500 Subject: [PATCH] Ensure we're not dealing with a fake player. Fixes #1749 --- src/main/java/com/gmail/nossr50/util/Misc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/src/main/java/com/gmail/nossr50/util/Misc.java index 9df51c364..f701496cc 100644 --- a/src/main/java/com/gmail/nossr50/util/Misc.java +++ b/src/main/java/com/gmail/nossr50/util/Misc.java @@ -64,7 +64,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"))); + 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")); } /**