From a269bf1ccc38b5d85f64f68a968647b08f1fa91a Mon Sep 17 00:00:00 2001 From: fullwall Date: Sun, 26 Apr 2020 21:28:51 +0800 Subject: [PATCH] Revert entity looking changes for now --- .../v1_10_R1/util/PlayerControllerLook.java | 2 +- .../v1_11_R1/util/PlayerControllerLook.java | 2 +- .../v1_12_R1/util/PlayerControllerLook.java | 2 +- .../v1_13_R2/util/PlayerControllerLook.java | 2 +- .../v1_14_R1/util/PlayerControllerLook.java | 2 +- .../v1_15_R1/util/PlayerControllerLook.java | 2 +- .../nms/v1_15_R1/util/PlayerlistTracker.java | 20 +++++++++---------- .../v1_8_R3/util/PlayerControllerLook.java | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerLook.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerLook.java index 9b0908600..861053407 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerLook.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerLook.java @@ -42,7 +42,7 @@ public class PlayerControllerLook { this.a.aQ += 360F; } } else { - this.a.yaw = b(this.a.yaw, this.a.aK, -40F); + // this.a.yaw = b(this.a.yaw, this.a.aK, -40F); // this.a.aQ = a(this.a.aQ, this.a.aO, 10.0F); } float f3 = MathHelper.g(this.a.aQ - this.a.aO); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerLook.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerLook.java index f3cec289b..62dab36aa 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerLook.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerLook.java @@ -42,7 +42,7 @@ public class PlayerControllerLook { this.a.aP += 360F; } } else { - this.a.yaw = this.b(this.a.yaw, this.a.aP, -40F); + // this.a.yaw = this.b(this.a.yaw, this.a.aP, -40F); // this.a.aP = a(this.a.aP, this.a.aN, 10.0F); } float f3 = MathHelper.g(this.a.aP - this.a.aN); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerLook.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerLook.java index 0e7a20a2a..7a06e3e37 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerLook.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerLook.java @@ -42,7 +42,7 @@ public class PlayerControllerLook { this.a.aP += 360F; } } else { - this.a.yaw = this.b(this.a.yaw, this.a.aP, -40F); + // this.a.yaw = this.b(this.a.yaw, this.a.aP, -40F); // this.a.aP = a(this.a.aP, this.a.aN, 10.0F); } float f3 = MathHelper.g(this.a.aP - this.a.aN); diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerLook.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerLook.java index 097522358..8707a16f2 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerLook.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerLook.java @@ -43,7 +43,7 @@ public class PlayerControllerLook { this.a.aS += 360F; } } else { - this.a.yaw = b(this.a.yaw, this.a.aS, -40F); + // this.a.yaw = b(this.a.yaw, this.a.aS, -40F); // this.a.aP = a(this.a.aS, this.a.aQ, 10.0F); } float f3 = MathHelper.g(this.a.aS - this.a.aQ); diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerLook.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerLook.java index 44346a057..6d81b46b6 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerLook.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerLook.java @@ -31,7 +31,7 @@ public class PlayerControllerLook { this.a.yaw = this.a.aM; this.a.pitch = this.a(this.a.pitch, this.g(), this.c); } else { - this.a.yaw = MathHelper.b(this.a.yaw, this.a.aM, -40F); + // this.a.yaw = MathHelper.b(this.a.yaw, this.a.aM, -40F); // this.a.aM = this.a(this.a.aM, this.a.aK, 10.0F); } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerLook.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerLook.java index e03ffa16d..1da123039 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerLook.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerLook.java @@ -31,7 +31,7 @@ public class PlayerControllerLook { this.a.yaw = this.a.aK; this.a.pitch = this.a(this.a.pitch, this.g(), this.c); } else { - this.a.yaw = MathHelper.b(this.a.yaw, this.a.aK, -40F); + // this.a.yaw = MathHelper.b(this.a.yaw, this.a.aK, 40F); // this.a.aK = this.a(this.a.aK, this.a.aI, 10.0F); } diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerlistTracker.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerlistTracker.java index 8c03ca0bc..e165e2d04 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerlistTracker.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerlistTracker.java @@ -111,15 +111,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker { return false; } - private static int getTrackingDistance(EntityTracker entry) { - try { - return (Integer) TRACKING_DISTANCE.invoke(entry); - } catch (Throwable e) { - e.printStackTrace(); - } - return 0; - } - private static Entity getTracker(EntityTracker entry) { try { return (Entity) TRACKER.invoke(entry); @@ -138,14 +129,23 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker { return null; } + private static int getTrackingDistance(EntityTracker entry) { + try { + return (Integer) TRACKING_DISTANCE.invoke(entry); + } catch (Throwable e) { + e.printStackTrace(); + } + return 0; + } + private static final MethodHandle B = NMS.getMethodHandle(PlayerChunkMap.class, "b", true, ChunkCoordIntPair.class, EntityPlayer.class, boolean.class); private static final MethodHandle D = NMS.getGetter(EntityTrackerEntry.class, "d"); private static final MethodHandle E = NMS.getGetter(EntityTrackerEntry.class, "e"); private static final MethodHandle GET_VISIBLE_CHUNK = NMS.getMethodHandle(PlayerChunkMap.class, "getVisibleChunk", true, long.class); - private static final MethodHandle TRACKING_DISTANCE = NMS.getGetter(EntityTracker.class, "trackingDistance"); private static final MethodHandle TRACKER = NMS.getGetter(EntityTracker.class, "tracker"); private static final MethodHandle TRACKER_ENTRY = NMS.getGetter(EntityTracker.class, "trackerEntry"); + private static final MethodHandle TRACKING_DISTANCE = NMS.getGetter(EntityTracker.class, "trackingDistance"); private static final MethodHandle VIEW_DISTANCE = NMS.getGetter(PlayerChunkMap.class, "viewDistance"); } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerLook.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerLook.java index 8ebffa922..d33074fc2 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerLook.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerLook.java @@ -43,7 +43,7 @@ public class PlayerControllerLook { this.a.aK += 360F; } } else { - this.a.yaw = b(this.a.yaw, this.a.aK, -40F); + // this.a.yaw = b(this.a.yaw, this.a.aK, -40F); // this.a.aK = a(this.a.aK, this.a.aI, 10.0F); } float f3 = MathHelper.g(this.a.aK - this.a.aI);