Skip to content

Commit 654ac10

Browse files
committed
wait a tick until objectMouseOver matches, fixes #254
1 parent ffc0506 commit 654ac10

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
import baritone.Baritone;
2121
import baritone.api.pathing.movement.IMovement;
2222
import baritone.api.pathing.movement.MovementStatus;
23-
import baritone.api.utils.BetterBlockPos;
24-
import baritone.api.utils.Rotation;
25-
import baritone.api.utils.RotationUtils;
26-
import baritone.api.utils.VecUtils;
23+
import baritone.api.utils.*;
2724
import baritone.utils.BlockBreakHelper;
2825
import baritone.utils.BlockStateInterface;
2926
import baritone.utils.Helper;
@@ -36,6 +33,7 @@
3633

3734
import java.util.ArrayList;
3835
import java.util.List;
36+
import java.util.Objects;
3937
import java.util.Optional;
4038

4139
import static baritone.utils.InputOverrideHandler.Input;
@@ -177,7 +175,10 @@ protected boolean prepared(MovementState state) {
177175
Optional<Rotation> reachable = RotationUtils.reachable(player(), blockPos);
178176
if (reachable.isPresent()) {
179177
MovementHelper.switchToBestToolFor(BlockStateInterface.get(blockPos));
180-
state.setTarget(new MovementState.MovementTarget(reachable.get(), true)).setInput(Input.CLICK_LEFT, true);
178+
state.setTarget(new MovementState.MovementTarget(reachable.get(), true));
179+
if (Objects.equals(RayTraceUtils.getSelectedBlock().orElse(null), blockPos)) {
180+
state.setInput(Input.CLICK_LEFT, true);
181+
}
181182
return false;
182183
}
183184
//get rekt minecraft
@@ -186,7 +187,9 @@ protected boolean prepared(MovementState state) {
186187
//you dont own me!!!!
187188
state.setTarget(new MovementState.MovementTarget(RotationUtils.calcRotationFromVec3d(player().getPositionEyes(1.0F),
188189
VecUtils.getBlockPosCenter(blockPos)), true)
189-
).setInput(InputOverrideHandler.Input.CLICK_LEFT, true);
190+
);
191+
// don't check selectedblock on this one, this is a fallback when we can't see any face directly, it's intended to be breaking the "incorrect" block
192+
state.setInput(InputOverrideHandler.Input.CLICK_LEFT, true);
190193
return false;
191194
}
192195
}

0 commit comments

Comments
 (0)