Merge branch 'master' into builder

This commit is contained in:
Leijurv 2019-01-29 19:58:51 -08:00
commit 5fb8a1d3d1
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 2 additions and 1 deletions

View File

@ -174,6 +174,7 @@ public class MovementAscend extends Movement {
if (MovementHelper.isBottomSlab(jumpingOnto) && !MovementHelper.isBottomSlab(BlockStateInterface.get(ctx, src.down()))) {
return state; // don't jump while walking from a non double slab into a bottom slab
}
if (Baritone.settings().assumeStep.get() || ctx.playerFeet().equals(src.up())) {
// no need to hit space if we're already jumping
return state;

View File

@ -335,4 +335,4 @@ public class MovementTraverse extends Movement {
}
return super.prepared(state);
}
}
}