0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix collision early return

Browse Source 
not tested yet
- fixes early returns
This commit is contained in:
Harry 2021-06-23 06:25:10 +10:00 committed by GitHub
parent 051325e10f
commit 3142387e45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/baritone/pathing/movement/movements/MovementParkour.java
View File

@ -108,10 +108,12 @@ public class MovementParkour extends Movement {
int destX = x + xDiff * i; int destX = x + xDiff * i;
int destZ = z + zDiff * i; int destZ = z + zDiff * i;
if (!MovementHelper.fullyPassable(context, destX, y + 1, destZ)) { if (!MovementHelper.fullyPassable(context, destX, y + 1, destZ)) {
return; maxJump = i - 1;
break;
} }
if (!MovementHelper.fullyPassable(context, destX, y + 2, destZ)) { if (!MovementHelper.fullyPassable(context, destX, y + 2, destZ)) {
return; maxJump = i - 1;
break;
} }
IBlockState destInto = context.bsi.get0(destX, y, destZ); IBlockState destInto = context.bsi.get0(destX, y, destZ);
if (!MovementHelper.fullyPassable(context.bsi.access, context.bsi.isPassableBlockPos.setPos(destX, y, destZ), destInto)) { if (!MovementHelper.fullyPassable(context.bsi.access, context.bsi.isPassableBlockPos.setPos(destX, y, destZ), destInto)) {
@ -120,9 +122,11 @@ public class MovementParkour extends Movement {
res.y = y + 1; res.y = y + 1;
res.z = destZ; res.z = destZ;
res.cost = i * SPRINT_ONE_BLOCK_COST + context.jumpPenalty; res.cost = i * SPRINT_ONE_BLOCK_COST + context.jumpPenalty;
}
return; return;
} }
maxJump = i - 1;
break;
}
IBlockState landingOn = context.bsi.get0(destX, y - 1, destZ); IBlockState landingOn = context.bsi.get0(destX, y - 1, destZ);
// farmland needs to be canWalkOn otherwise farm can never work at all, but we want to specifically disallow ending a jump on farmland haha // farmland needs to be canWalkOn otherwise farm can never work at all, but we want to specifically disallow ending a jump on farmland haha
if (landingOn.getBlock() != Blocks.FARMLAND && MovementHelper.canWalkOn(context.bsi, destX, y - 1, destZ, landingOn)) { if (landingOn.getBlock() != Blocks.FARMLAND && MovementHelper.canWalkOn(context.bsi, destX, y - 1, destZ, landingOn)) {
@ -131,11 +135,14 @@ public class MovementParkour extends Movement {
res.y = y; res.y = y;
res.z = destZ; res.z = destZ;
res.cost = costFromJumpDistance(i) + context.jumpPenalty; res.cost = costFromJumpDistance(i) + context.jumpPenalty;
}
return; return;
} }
maxJump = i - 1;
break;
}
if (!MovementHelper.fullyPassable(context, destX, y + 3, destZ)) { if (!MovementHelper.fullyPassable(context, destX, y + 3, destZ)) {
return; maxJump = i - 1;
break;
} }
} }
// parkour place starts here // parkour place starts here