From eb64a43bf31fd7571b586e9f2ee1f00fd77dae77 Mon Sep 17 00:00:00 2001 From: fullwall Date: Fri, 12 Oct 2012 11:52:48 +0800 Subject: [PATCH] Work around some plugins not extending from CraftEntity --- src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java b/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java index c03ba0013..2a4588312 100644 --- a/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java +++ b/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java @@ -143,7 +143,7 @@ public class CitizensNPCRegistry implements NPCRegistry { @Override public NPC getNPC(Entity entity) { - if (entity == null) + if (entity == null || !(entity instanceof CraftEntity)) return null; net.minecraft.server.Entity handle = ((CraftEntity) entity).getHandle(); return handle != null && handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null;