Fix incorrect navigation checking

CitizensDev · Dec 12, 2019 · a04f054 · a04f054
1 parent 64aa09b
commit a04f054
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -1566,7 +1566,7 @@ public static void initNetworkManager(NetworkManager network) {
     }
 
     public static boolean isNavigationFinished(NavigationAbstract navigation) {
-        return navigation.n();
+        return navigation.m();
     }
 
     @SuppressWarnings("deprecation")
@@ -1711,10 +1711,10 @@ public static void updateNavigation(NavigationAbstract navigation) {
 
     private static final MethodHandle ADVANCEMENT_PLAYER_FIELD = NMS.getFinalSetter(EntityPlayer.class,
             "advancementDataPlayer");
-    private static final Set<EntityType> 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<EntityType> 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
@@ -31,10 +31,10 @@ public void a() {
             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);
         }
     }