diff --git a/src/main/java/ellpeck/actuallyadditions/event/EntityLivingEvent.java b/src/main/java/ellpeck/actuallyadditions/event/EntityLivingEvent.java index 9d09b3d62..b296c813b 100644 --- a/src/main/java/ellpeck/actuallyadditions/event/EntityLivingEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/EntityLivingEvent.java @@ -28,7 +28,7 @@ public class EntityLivingEvent{ @SubscribeEvent public void livingUpdateEvent(LivingUpdateEvent event){ //Ocelots dropping Hair Balls - if(!event.entityLiving.worldObj.isRemote){ + if(event.entityLiving != null && event.entityLiving.worldObj != null && !event.entityLiving.worldObj.isRemote){ if(event.entityLiving instanceof EntityOcelot){ EntityOcelot theOcelot = (EntityOcelot)event.entityLiving; if(ConfigBoolValues.DO_CAT_DROPS.isEnabled() && theOcelot.isTamed()){