Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-19 13:51:42 +01:00
Code Issues Projects Releases Wiki Activity

Work around some plugins not extending from CraftEntity

Browse Source
This commit is contained in:
fullwall 2012-10-12 11:52:48 +08:00
parent fb068c593f
commit 414c82d78f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
View File

@ -143,7 +143,7 @@ public class CitizensNPCRegistry implements NPCRegistry {
@Override @Override
public NPC getNPC(Entity entity) { public NPC getNPC(Entity entity) {
if (entity == null) if (entity == null || !(entity instanceof CraftEntity))
return null; return null;
net.minecraft.server.Entity handle = ((CraftEntity) entity).getHandle(); net.minecraft.server.Entity handle = ((CraftEntity) entity).getHandle();
return handle != null && handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; return handle != null && handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null;