Skip to content

Commit a9f40fb

Browse files
authored
Merge pull request #4885 from Skylandia/tripwire-support
Allow pathing through tripwires
2 parents d196c64 + 521303b commit a9f40fb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/api/java/baritone/api/Settings.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,9 @@ public final class Settings {
237237
/**
238238
* Blocks that Baritone will attempt to avoid (Used in avoidance)
239239
*/
240-
public final Setting<List<Block>> blocksToAvoid = new Setting<>(new ArrayList<>(
241-
// Leave Empty by Default
242-
));
240+
public final Setting<List<Block>> blocksToAvoid = new Setting<>(new ArrayList<>(List.of(
241+
Blocks.TRIPWIRE
242+
)));
243243

244244
/**
245245
* Blocks that Baritone is not allowed to break

src/main/java/baritone/pathing/movement/MovementHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static Ternary canWalkThroughBlockState(BlockState state) {
141141
if (block instanceof AirBlock) {
142142
return YES;
143143
}
144-
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.SWEET_BERRY_BUSH || block == Blocks.POINTED_DRIPSTONE || block instanceof AmethystClusterBlock || block instanceof AzaleaBlock) {
144+
if (block instanceof BaseFireBlock || 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.SWEET_BERRY_BUSH || block == Blocks.POINTED_DRIPSTONE || block instanceof AmethystClusterBlock || block instanceof AzaleaBlock) {
145145
return NO;
146146
}
147147
if (block == Blocks.BIG_DRIPLEAF) {

0 commit comments

Comments
 (0)