Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-30 14:43:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix getBukkitEntity() for nulls

Browse Source
This commit is contained in:
fullwall 2013-11-06 00:58:20 +08:00
parent dd58a07528
commit 7c45b167c0
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/CitizensNPC.java
View File

@ -90,7 +90,7 @@ public class CitizensNPC extends AbstractNPC {
return null; return null;
} }
Entity entity = entityController.getBukkitEntity(); Entity entity = entityController.getBukkitEntity();
if (entity instanceof LivingEntity) { if (entity == null || entity instanceof LivingEntity) {
return (LivingEntity) entity; return (LivingEntity) entity;
} }
throw new IllegalStateException("getBukkitEntity() called on a non-living NPC"); throw new IllegalStateException("getBukkitEntity() called on a non-living NPC");