From a04f054fb94d40ad5788d5e4a89fca2371a079c5 Mon Sep 17 00:00:00 2001 From: fullwall Date: Fri, 13 Dec 2019 00:08:20 +0800 Subject: [PATCH] Fix incorrect navigation checking --- .../net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java | 10 +++++----- .../nms/v1_15_R1/util/PlayerControllerLook.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java index 2c8a80261..33c68a63a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java @@ -1566,7 +1566,7 @@ public class NMSImpl implements NMSBridge { } public static boolean isNavigationFinished(NavigationAbstract navigation) { - return navigation.n(); + return navigation.m(); } @SuppressWarnings("deprecation") @@ -1711,10 +1711,10 @@ public class NMSImpl implements NMSBridge { private static final MethodHandle ADVANCEMENT_PLAYER_FIELD = NMS.getFinalSetter(EntityPlayer.class, "advancementDataPlayer"); - private static final Set BAD_CONTROLLER_LOOK = EnumSet.of(EntityType.POLAR_BEAR, EntityType.SILVERFISH, - EntityType.SHULKER, EntityType.ENDERMITE, EntityType.ENDER_DRAGON, EntityType.BAT, EntityType.SLIME, - EntityType.DOLPHIN, EntityType.MAGMA_CUBE, EntityType.HORSE, EntityType.GHAST, EntityType.SHULKER, - EntityType.PHANTOM); + private static final Set BAD_CONTROLLER_LOOK = EnumSet.of(EntityType.POLAR_BEAR, EntityType.BEE, + EntityType.SILVERFISH, EntityType.SHULKER, EntityType.ENDERMITE, EntityType.ENDER_DRAGON, EntityType.BAT, + EntityType.SLIME, EntityType.DOLPHIN, EntityType.MAGMA_CUBE, EntityType.HORSE, EntityType.GHAST, + EntityType.SHULKER, EntityType.PHANTOM); private static final MethodHandle BEHAVIOR_MAP = NMS.getGetter(BehaviorController.class, "c"); private static final MethodHandle BLOCK_POSITION_B_D = NMS.getMethodHandle(BlockPosition.PooledBlockPosition.class, "c", false, double.class, double.class, double.class); 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 a97179c09..42bce49d2 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,10 +31,10 @@ public class PlayerControllerLook { this.a.yaw = this.a.aK; this.a.pitch = this.a(this.a.pitch, this.g(), this.c); } else { - // this.a.K = this.a(this.a.aK, this.a.aI, 10.0F); + // this.a.aK = this.a(this.a.aK, this.a.aI, 10.0F); } - if (!this.a.getNavigation().n()) { + if (!this.a.getNavigation().m()) { this.a.aK = MathHelper.b(this.a.aK, this.a.aI, 75); } }