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

Merge branch '1.17.1' into 1.18

Browse Source 
change so rebuilds
This commit is contained in:
Wagyourtail
2022-01-10 11:29:43 -07:00
parent 587c2cc8e2 33ee39dcce
commit c4da682e84
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/baritone/pathing/movement/MovementHelper.java
View File

@@ -97,7 +97,10 @@ public interface MovementHelper extends ActionCosts, Helper {
if (block instanceof AirBlock) { // early return for most common case
return true;
}
if (block instanceof BaseFireBlock || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock || block == Blocks.HONEY_BLOCK || block == Blocks.END_ROD || block == Blocks.POINTED_DRIPSTONE || block == Blocks.AMETHYST_CLUSTER) {
if (block instanceof BaseFireBlock || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock || block == Blocks.HONEY_BLOCK || block == Blocks.END_ROD || block == Blocks.POINTED_DRIPSTONE || block == Blocks.AMETHYST_CLUSTER || block instanceof AzaleaBlock) {
return false;
}
if (block == Blocks.BIG_DRIPLEAF) {
return false;
}
if (Baritone.settings().blocksToAvoid.value.contains(block)) {
@@ -183,6 +186,7 @@ public interface MovementHelper extends ActionCosts, Helper {
|| block == Blocks.VINE
|| block == Blocks.LADDER
|| block == Blocks.COCOA
|| block instanceof AzaleaBlock
|| block instanceof DoorBlock
|| block instanceof FenceGateBlock
|| block instanceof SnowLayerBlock
@@ -310,6 +314,9 @@ public interface MovementHelper extends ActionCosts, Helper {
if (isBlockNormalCube(state)) {
return true;
}
if (block instanceof AzaleaBlock) {
return true;
}
if (block == Blocks.LADDER || (block == Blocks.VINE && Baritone.settings().allowVines.value)) { // TODO reconsider this
return true;
}