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

deal with fence gate properly, fixes #172

Browse Source
This commit is contained in:
Leijurv 2018-09-18 12:23:03 -07:00
parent f13bcbd49f
commit b47b813462
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/baritone/pathing/movement/movements/MovementPillar.java
View File

@ -67,20 +67,25 @@ public class MovementPillar extends Movement {
return COST_INF; return COST_INF;
} }
} }
double hardness = getTotalHardnessOfBlocksToBreak(context); BlockPos toBreakPos = src.up(2);
IBlockState toBreak = BlockStateInterface.get(toBreakPos);
Block toBreakBlock = toBreak.getBlock();
if (toBreakBlock instanceof BlockFenceGate) {
return COST_INF;
}
double hardness = MovementHelper.getMiningDurationTicks(context, toBreakPos, toBreak, true);
if (hardness >= COST_INF) { if (hardness >= COST_INF) {
return COST_INF; return COST_INF;
} }
if (hardness != 0) { if (hardness != 0) {
Block tmp = BlockStateInterface.get(src.up(2)).getBlock(); if (toBreakBlock instanceof BlockLadder || toBreakBlock instanceof BlockVine) {
if (tmp instanceof BlockLadder || tmp instanceof BlockVine) {
hardness = 0; // we won't actually need to break the ladder / vine because we're going to use it hardness = 0; // we won't actually need to break the ladder / vine because we're going to use it
} else { } else {
BlockPos chkPos = src.up(3); BlockPos chkPos = src.up(3);
IBlockState check = BlockStateInterface.get(chkPos); IBlockState check = BlockStateInterface.get(chkPos);
if (check.getBlock() instanceof BlockFalling) { if (check.getBlock() instanceof BlockFalling) {
// see MovementAscend's identical check for breaking a falling block above our head // see MovementAscend's identical check for breaking a falling block above our head
if (!(tmp instanceof BlockFalling) || !(BlockStateInterface.get(src.up(1)).getBlock() instanceof BlockFalling)) { if (!(toBreakBlock instanceof BlockFalling) || !(BlockStateInterface.get(src.up(1)).getBlock() instanceof BlockFalling)) {
return COST_INF; return COST_INF;
} }
} }