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

mine the block anyway, avoid unreachable loop

Browse Source
This commit is contained in:
leijurv 2018-08-20 20:17:55 -07:00
parent 7f578bc3bf
commit 177e15fc09
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/baritone/bot/pathing/movement/Movement.java
View File

@ -24,10 +24,7 @@ import baritone.bot.pathing.movement.MovementState.MovementStatus;
import baritone.bot.pathing.movement.movements.MovementDownward; import baritone.bot.pathing.movement.movements.MovementDownward;
import baritone.bot.pathing.movement.movements.MovementPillar; import baritone.bot.pathing.movement.movements.MovementPillar;
import baritone.bot.pathing.movement.movements.MovementTraverse; import baritone.bot.pathing.movement.movements.MovementTraverse;
import baritone.bot.utils.BlockStateInterface; import baritone.bot.utils.*;
import baritone.bot.utils.Helper;
import baritone.bot.utils.Rotation;
import baritone.bot.utils.ToolSet;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockLadder; import net.minecraft.block.BlockLadder;
import net.minecraft.block.BlockVine; import net.minecraft.block.BlockVine;
@ -137,6 +134,14 @@ public abstract class Movement implements Helper, MovementHelper {
state.setTarget(new MovementState.MovementTarget(reachable.get())).setInput(Input.CLICK_LEFT, true); state.setTarget(new MovementState.MovementTarget(reachable.get())).setInput(Input.CLICK_LEFT, true);
return false; return false;
} }
//get rekt minecraft
//i'm doing it anyway
//i dont care if theres snow in the way!!!!!!!
//you dont own me!!!!
state.setTarget(new MovementState.MovementTarget(Utils.calcRotationFromVec3d(mc.player.getPositionEyes(1.0F),
Utils.getBlockPosCenter(blockPos)))
).setInput(InputOverrideHandler.Input.CLICK_LEFT, true);
return false;
} }
} }
if (somethingInTheWay) { if (somethingInTheWay) {
@ -168,7 +173,6 @@ public abstract class Movement implements Helper, MovementHelper {
public void onFinish(MovementState state) { public void onFinish(MovementState state) {
state.getInputStates().replaceAll((input, forced) -> false); state.getInputStates().replaceAll((input, forced) -> false);
state.getInputStates().forEach((input, forced) -> Baritone.INSTANCE.getInputOverrideHandler().setInputForceState(input, forced)); state.getInputStates().forEach((input, forced) -> Baritone.INSTANCE.getInputOverrideHandler().setInputForceState(input, forced));
state.setStatus(MovementStatus.SUCCESS);
} }
public void cancel() { public void cancel() {

2
src/main/java/baritone/bot/pathing/path/PathExecutor.java
View File

@ -217,7 +217,7 @@ public class PathExecutor implements Helper {
return true; return true;
} }
if (movementStatus == SUCCESS) { if (movementStatus == SUCCESS) {
System.out.println("Movement done, next path"); //System.out.println("Movement done, next path");
pathPosition++; pathPosition++;
ticksOnCurrent = 0; ticksOnCurrent = 0;
Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys(); Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys();