Make jump behaviour more consistent on slabs for new pathfinder

CitizensDev · Mar 6, 2016 · 4904b3e · 4904b3e
1 parent f53ccc3
commit 4904b3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
@@ -2,6 +2,7 @@
 
 import org.bukkit.Effect;
 import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.Settings.Setting;
@@ -22,10 +23,9 @@ public class AStarNavigationStrategy extends AbstractPathStrategy {
     private final NPC npc;
     private final NavigatorParameters params;
     private Path plan;
-
     private Vector vector;
 
-    AStarNavigationStrategy(NPC npc, Location dest, NavigatorParameters params) {
+    public AStarNavigationStrategy(NPC npc, Location dest, NavigatorParameters params) {
         super(TargetType.LOCATION);
         this.params = params;
         this.destination = dest;
@@ -80,7 +80,7 @@ public boolean update() {
             npc.getEntity().getWorld().playEffect(vector.toLocation(npc.getEntity().getWorld()), Effect.ENDER_SIGNAL,
                     0);
         }
-        if (distance > 0 && dY > 0 && dY < 1 && xzDistance <= 2.75) {
+        if (distance > 0 && dY > NMS.getStepHeight((LivingEntity) npc.getEntity()) && xzDistance <= 2.75) {
             NMS.setShouldJump(npc.getEntity());
         }
         double destX = vector.getX() + 0.5, destZ = vector.getZ() + 0.5;

diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -471,7 +471,7 @@ public static float getSpeedFor(NPC npc) {
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
     }
 
-    public static float getStepHeight(LivingEntity entity) {
+    public static float getStepHeight(org.bukkit.entity.Entity entity) {
         return NMS.getHandle(entity).P;
     }