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

Fix spout compat

Browse Source
This commit is contained in:
fullwall 2012-10-16 17:50:57 +08:00
parent 4696f27825
commit b096dcfd8b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ import net.citizensnpcs.npc.entity.CitizensWolfNPC;
import net.citizensnpcs.npc.entity.CitizensZombieNPC;
import net.citizensnpcs.util.ByIdArray;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
@ -144,7 +145,10 @@ public class CitizensNPCRegistry implements NPCRegistry {
public NPC getNPC(Entity entity) {
if (entity == null)
return null;
return entity instanceof NPCHolder ? ((NPCHolder) entity).getNPC() : null;
if (entity instanceof NPCHolder)
return ((NPCHolder) entity).getNPC();
net.minecraft.server.Entity handle = ((CraftEntity) entity).getHandle();
return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null;
}
@Override