From 7b40351c5f9ff2764e2bc311adf002b960907905 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Wed, 3 Aug 2016 14:19:36 +0800
Subject: [PATCH] Fix bug with entity navigation

---
 .../nms/v1_10_R1/util/NMSImpl.java            | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
index d7d4d6ce3..45ada5a74 100644
--- a/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
+++ b/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
@@ -470,8 +470,9 @@ public class NMSImpl implements NMSBridge {
     @Override
     public TargetNavigator getTargetNavigator(org.bukkit.entity.Entity entity, org.bukkit.entity.Entity target,
             NavigatorParameters parameters) {
-        return getNavigation(entity) == null ? null
-                : new NavigationFieldWrapper(getNavigation(entity), entity, target, parameters);
+        NavigationAbstract navigation = getNavigation(entity);
+        return navigation == null ? null
+                : new NavigationFieldWrapper(navigation, target, parameters);
     }
 
     @Override
@@ -918,15 +919,13 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static class NavigationFieldWrapper implements TargetNavigator {
-        private final org.bukkit.entity.Entity handle;
         private final NavigationAbstract navigation;
         private final NavigatorParameters parameters;
         private final org.bukkit.entity.Entity target;
 
-        private NavigationFieldWrapper(NavigationAbstract navigation, org.bukkit.entity.Entity handle,
-                org.bukkit.entity.Entity target, NavigatorParameters parameters) {
+        private NavigationFieldWrapper(NavigationAbstract navigation, org.bukkit.entity.Entity target,
+                NavigatorParameters parameters) {
             this.navigation = navigation;
-            this.handle = handle;
             this.target = target;
             this.parameters = parameters;
         }
@@ -942,10 +941,7 @@ public class NMSImpl implements NMSBridge {
             if (location == null) {
                 throw new IllegalStateException("mapper should not return null");
             }
-            Location oldLoc = target.getLocation(HANDLE_LOCATION);
-            target.teleport(location);
-            NMS.setNavigationTarget(handle, target, parameters.speed());
-            target.teleport(oldLoc);
+            navigation.a(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
         @Override
@@ -956,9 +952,7 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void update() {
             updateNavigation(navigation);
-        }
-
-        private static final Location HANDLE_LOCATION = new Location(null, 0, 0, 0);
+        };
     }
 
     private static class NavigationIterable implements Iterable<Vector> {