Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-24 03:25:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CitizensDev/Citizens2

Browse Source
This commit is contained in:
fullwall 2012-12-05 16:18:42 +08:00
commit f1a1138538
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -44,7 +44,6 @@ public abstract class CitizensNPC extends AbstractNPC {
protected CitizensNPC(int id, String name) { protected CitizensNPC(int id, String name) {
super(id, name); super(id, name);
runnables.add(navigator);
} }
protected abstract EntityLiving createHandle(Location loc); protected abstract EntityLiving createHandle(Location loc);
@ -220,8 +219,10 @@ public abstract class CitizensNPC extends AbstractNPC {
public void update() { public void update() {
try { try {
super.update(); super.update();
if (isSpawned()) if (isSpawned()) {
NMS.trySwim(getHandle()); NMS.trySwim(getHandle());
navigator.run();
}
} catch (Exception ex) { } catch (Exception ex) {
Messaging.logTr(Messages.EXCEPTION_UPDATING_NPC, getId(), ex.getMessage()); Messaging.logTr(Messages.EXCEPTION_UPDATING_NPC, getId(), ex.getMessage());
ex.printStackTrace(); ex.printStackTrace();