Fix turtle lag (for real this time) (#1503)

Amends #1502, to further fix #1501

Spigot-Server-Patches/0379-Fix-turtle-lag.patch

@@ -1,30 +1,31 @@
-From 22d541c4acb10c02491d426d9d43961369d6a7a0 Mon Sep 17 00:00:00 2001
+From 984c873f273e8f63bb5c4d3d5704b301a818d5f6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 28 Sep 2018 12:27:54 -0500
 Subject: [PATCH] Fix turtle lag
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 1b09f577e9..b515eeb230 100644
+index 1b09f577e..4f5592d1c 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
-@@ -68,6 +68,7 @@ public class EntityTurtle extends EntityAnimal {
+@@ -599,7 +599,7 @@ public class EntityTurtle extends EntityAnimal {
-         this.datawatcher.set(EntityTurtle.bI, Boolean.valueOf(flag));
+                 ++this.d;
-     }
+             }
  
-+    private boolean isTravelling() { return dI(); } // Paper - OBFHELPER
+-            if (this.a.dA() || this.a.getNavigation().p()) {
-     private boolean dI() {
++            if (/*this.a.dA() ||*/ this.a.getNavigation().p()) { // Paper - Fix GH-1501
-         return ((Boolean) this.datawatcher.get(EntityTurtle.bJ)).booleanValue();
+                 Vec3D vec3d = RandomPositionGenerator.a((EntityCreature) this.a, 16, 3, new Vec3D((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()), 0.3141592741012573D);
-     }
+ 
-@@ -633,7 +634,7 @@ public class EntityTurtle extends EntityAnimal {
+                 if (vec3d == null) {
+@@ -656,7 +656,7 @@ public class EntityTurtle extends EntityAnimal {
          }
  
-         public boolean a() {
+         public void e() {
--            return !this.a.dH() && !this.a.dy() && this.a.isInWater();
+-            if (this.a.dA() || this.a.getNavigation().p()) {
-+            return !this.a.isTravelling() && !this.a.dH() && !this.a.dy() && this.a.isInWater(); // Paper
++            if (/*this.a.dA() ||*/ this.a.getNavigation().p()) { // Paper - Fix GH-1501
-         }
+                 BlockPosition blockposition = this.a.dC();
+                 Vec3D vec3d = RandomPositionGenerator.a((EntityCreature) this.a, 16, 3, new Vec3D((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()), 0.3141592741012573D);
  
-         public void c() {
 -- 
 2.19.0