From fb2ebc0a313b1f265f4314c167a90860d298fabb Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Fri, 1 Jan 2016 13:00:17 +0800
Subject: [PATCH] Fix wither movement

---
 .../npc/entity/WitherController.java          | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java
index c1541cf5b..9036946fb 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java
@@ -1,5 +1,12 @@
 package net.citizensnpcs.npc.entity;
 
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftWither;
+import org.bukkit.entity.Wither;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -11,13 +18,6 @@ import net.minecraft.server.v1_8_R3.EntityWither;
 import net.minecraft.server.v1_8_R3.NBTTagCompound;
 import net.minecraft.server.v1_8_R3.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftWither;
-import org.bukkit.entity.Wither;
-import org.bukkit.util.Vector;
-
 public class WitherController extends MobEntityController {
     public WitherController() {
         super(EntityWitherNPC.class);
@@ -92,6 +92,7 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.E();
             }
+            npc.update();
         }
 
         @Override
@@ -129,13 +130,8 @@ public class WitherController extends MobEntityController {
         }
 
         @Override
-        public void m() {
-            if (npc == null) {
-                super.m();
-            } else {
-                NMS.updateAI(this);
-                npc.update();
-            }
+        public int s(int i) {
+            return npc == null ? super.s(i) : 0;
         }
 
         @Override