Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-29 12:37:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE

Browse Source
This commit is contained in:
fullwall 2013-07-20 16:22:46 +08:00
parent d030909524
commit e75227d0cd
2 changed files with 1 additions and 2 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

@ -78,7 +78,7 @@ public class CitizensNPC extends AbstractNPC {
@Override @Override
public LivingEntity getBukkitEntity() { public LivingEntity getBukkitEntity() {
return entityController.getBukkitEntity(); return entityController == null ? null : entityController.getBukkitEntity();
} }
@Override @Override

1
src/main/java/net/citizensnpcs/npc/entity/HorseController.java
View File

@ -29,7 +29,6 @@ public class HorseController extends MobEntityController {
public static class EntityHorseNPC extends EntityHorse implements NPCHolder { public static class EntityHorseNPC extends EntityHorse implements NPCHolder {
private int jumpTicks; private int jumpTicks;
private final CitizensNPC npc; private final CitizensNPC npc;
public EntityHorseNPC(World world) { public EntityHorseNPC(World world) {