From b67c37fd6c1ddffe91de7ee6c57393a9169bfec5 Mon Sep 17 00:00:00 2001 From: Wyn Price Date: Wed, 22 Jan 2020 19:24:07 +0000 Subject: [PATCH] Fixed rounding issue with entity navigation fix (#6455) --- .../net/minecraft/pathfinding/PathNavigator.java.patch | 2 +- .../net/minecraft/pathfinding/SwimmerPathNavigator.java.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/pathfinding/PathNavigator.java.patch b/patches/minecraft/net/minecraft/pathfinding/PathNavigator.java.patch index d2d49626e3..fb0872b225 100644 --- a/patches/minecraft/net/minecraft/pathfinding/PathNavigator.java.patch +++ b/patches/minecraft/net/minecraft/pathfinding/PathNavigator.java.patch @@ -6,7 +6,7 @@ Vec3d vec3d1 = this.field_75514_c.func_186310_f(); - if (Math.abs(this.field_75515_a.field_70165_t - (vec3d1.field_72450_a + 0.5D)) < (double)this.field_188561_o && Math.abs(this.field_75515_a.field_70161_v - (vec3d1.field_72449_c + 0.5D)) < (double)this.field_188561_o && Math.abs(this.field_75515_a.field_70163_u - vec3d1.field_72448_b) < 1.0D) { + // Forge: fix MC-94054 -+ if (Math.abs(this.field_75515_a.field_70165_t - (vec3d1.field_72450_a + (this.field_75515_a.func_213311_cf() + 1) / 2D)) < (double)this.field_188561_o && Math.abs(this.field_75515_a.field_70161_v - (vec3d1.field_72449_c + (this.field_75515_a.func_213311_cf() + 1) / 2D)) < (double)this.field_188561_o && Math.abs(this.field_75515_a.field_70163_u - vec3d1.field_72448_b) < 1.0D) { ++ if (Math.abs(this.field_75515_a.field_70165_t - (vec3d1.field_72450_a + (int)(this.field_75515_a.func_213311_cf() + 1) / 2D)) < (double)this.field_188561_o && Math.abs(this.field_75515_a.field_70161_v - (vec3d1.field_72449_c + (int)(this.field_75515_a.func_213311_cf() + 1) / 2D)) < (double)this.field_188561_o && Math.abs(this.field_75515_a.field_70163_u - vec3d1.field_72448_b) < 1.0D) { this.field_75514_c.func_75872_c(this.field_75514_c.func_75873_e() + 1); } diff --git a/patches/minecraft/net/minecraft/pathfinding/SwimmerPathNavigator.java.patch b/patches/minecraft/net/minecraft/pathfinding/SwimmerPathNavigator.java.patch index 641e2a9e28..6509350bf9 100644 --- a/patches/minecraft/net/minecraft/pathfinding/SwimmerPathNavigator.java.patch +++ b/patches/minecraft/net/minecraft/pathfinding/SwimmerPathNavigator.java.patch @@ -6,7 +6,7 @@ Vec3d vec3d2 = this.field_75514_c.func_186310_f(); - if (Math.abs(this.field_75515_a.field_70165_t - (vec3d2.field_72450_a + 0.5D)) < (double)f1 && Math.abs(this.field_75515_a.field_70161_v - (vec3d2.field_72449_c + 0.5D)) < (double)f1 && Math.abs(this.field_75515_a.field_70163_u - vec3d2.field_72448_b) < (double)(f1 * 2.0F)) { + // Forge: fix MC-94054 -+ if (Math.abs(this.field_75515_a.field_70165_t - (vec3d2.field_72450_a + (this.field_75515_a.func_213311_cf() + 1) / 2D)) < (double)f1 && Math.abs(this.field_75515_a.field_70161_v - (vec3d2.field_72449_c + (this.field_75515_a.func_213311_cf() + 1) / 2D)) < (double)f1 && Math.abs(this.field_75515_a.field_70163_u - vec3d2.field_72448_b) < (double)(f1 * 2.0F)) { ++ if (Math.abs(this.field_75515_a.field_70165_t - (vec3d2.field_72450_a + (int)(this.field_75515_a.func_213311_cf() + 1) / 2D)) < (double)f1 && Math.abs(this.field_75515_a.field_70161_v - (vec3d2.field_72449_c + (int)(this.field_75515_a.func_213311_cf() + 1) / 2D)) < (double)f1 && Math.abs(this.field_75515_a.field_70163_u - vec3d2.field_72448_b) < (double)(f1 * 2.0F)) { this.field_75514_c.func_75875_a(); }