20
20
import baritone .Baritone ;
21
21
import baritone .api .pathing .movement .IMovement ;
22
22
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 .*;
27
24
import baritone .utils .BlockBreakHelper ;
28
25
import baritone .utils .BlockStateInterface ;
29
26
import baritone .utils .Helper ;
36
33
37
34
import java .util .ArrayList ;
38
35
import java .util .List ;
36
+ import java .util .Objects ;
39
37
import java .util .Optional ;
40
38
41
39
import static baritone .utils .InputOverrideHandler .Input ;
@@ -177,7 +175,10 @@ protected boolean prepared(MovementState state) {
177
175
Optional <Rotation > reachable = RotationUtils .reachable (player (), blockPos );
178
176
if (reachable .isPresent ()) {
179
177
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
+ }
181
182
return false ;
182
183
}
183
184
//get rekt minecraft
@@ -186,7 +187,9 @@ protected boolean prepared(MovementState state) {
186
187
//you dont own me!!!!
187
188
state .setTarget (new MovementState .MovementTarget (RotationUtils .calcRotationFromVec3d (player ().getPositionEyes (1.0F ),
188
189
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 );
190
193
return false ;
191
194
}
192
195
}
0 commit comments