diff --git a/src/main/java/baritone/behavior/InventoryBehavior.java b/src/main/java/baritone/behavior/InventoryBehavior.java index 9e1b77f0f..6c55663a6 100644 --- a/src/main/java/baritone/behavior/InventoryBehavior.java +++ b/src/main/java/baritone/behavior/InventoryBehavior.java @@ -185,10 +185,6 @@ public final class InventoryBehavior extends Behavior implements Helper { } public boolean throwaway(boolean select, Predicate desired) { - return this.throwaway(select, desired, Baritone.settings().allowInventory.value); - } - - public boolean throwaway(boolean select, Predicate desired, boolean allowInventory) { EntityPlayerSP p = ctx.player(); NonNullList inv = p.inventory.mainInventory; for (int i = 0; i < 9; i++) { @@ -205,6 +201,7 @@ public final class InventoryBehavior extends Behavior implements Helper { return true; } } + if (desired.test(p.inventory.offHandInventory.get(0))) { // main hand takes precedence over off hand // that means that if we have block A selected in main hand and block B in off hand, right clicking places block B @@ -222,7 +219,7 @@ public final class InventoryBehavior extends Behavior implements Helper { } } - if (allowInventory) { + if (this.canAccessInventory()) { for (int i = 9; i < 36; i++) { if (desired.test(inv.get(i))) { if (select) { @@ -236,4 +233,8 @@ public final class InventoryBehavior extends Behavior implements Helper { return false; } + + public boolean canAccessInventory() { + return Baritone.settings().allowInventory.value; + } } diff --git a/src/main/java/baritone/process/BuilderProcess.java b/src/main/java/baritone/process/BuilderProcess.java index 60066971e..0a46774d4 100644 --- a/src/main/java/baritone/process/BuilderProcess.java +++ b/src/main/java/baritone/process/BuilderProcess.java @@ -542,7 +542,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil return new PathingCommand(null, PathingCommandType.CANCEL_AND_SET_GOAL); } - if (Baritone.settings().allowInventory.value) { + if (baritone.getInventoryBehavior().canAccessInventory()) { ArrayList usefulSlots = new ArrayList<>(); List noValidHotbarOption = new ArrayList<>(); outer: