merge

FEATURES.md

@@ -38,6 +38,7 @@ And finally `GoalComposite`. `GoalComposite` is a list of other goals, any one o
 Things it doesn't have yet
 - Trapdoors
 - Sprint jumping in a 1x2 corridor
+- Parkour (jumping over gaps of any length) [IN PROGRESS]
 
 See <a href="https://github.com/cabaletta/baritone/issues">issues</a> for more.
 

src/main/java/baritone/pathing/goals/GoalGetToBlock.java

@@ -47,8 +47,8 @@ public class GoalGetToBlock implements Goal {
         int xDiff = pos.getX() - this.x;
         int yDiff = pos.getY() - this.y;
         int zDiff = pos.getZ() - this.z;
-        if (yDiff == -2 && xDiff == 0 && zDiff == 0) {
-            return true;
+        if (yDiff < 0) {
+            yDiff++;
         }
         return Math.abs(xDiff) + Math.abs(yDiff) + Math.abs(zDiff) <= 1;
     }

src/test/java/baritone/pathing/goals/GoalGetToBlockTest.java

@@ -30,7 +30,7 @@ public class GoalGetToBlockTest {
 
     @Test
     public void isInGoal() {
-        List<String> acceptableOffsets = new ArrayList<>(Arrays.asList("0,0,0", "0,0,1", "0,0,-1", "1,0,0", "-1,0,0", "0,1,0", "0,-1,0", "0,-2,0"));
+        List<String> acceptableOffsets = new ArrayList<>(Arrays.asList("0,0,0", "0,0,1", "0,0,-1", "1,0,0", "-1,0,0", "0,-1,1", "0,-1,-1", "1,-1,0", "-1,-1,0", "0,1,0", "0,-1,0", "0,-2,0"));
         for (int x = -10; x <= 10; x++) {
             for (int y = -10; y <= 10; y++) {
                 for (int z = -10; z <= 10; z++) {