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

Amends #1502, to further fix #1501
This commit is contained in:
BillyGalbreath 2018-09-28 20:27:40 -05:00
parent d10ea572de
commit c777e6f255

View file

@ -5,24 +5,25 @@ 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 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 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -0,0 +0,0 @@ public class EntityTurtle extends EntityAnimal { @@ -0,0 +0,0 @@ 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);
}
if (vec3d == null) {
@@ -0,0 +0,0 @@ public class EntityTurtle extends EntityAnimal { @@ -0,0 +0,0 @@ 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() {
-- --