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

babe

Browse Source
This commit is contained in:
Leijurv 2018-08-15 06:50:43 -07:00
parent d2ad15b79f
commit 28fd9581bc
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/baritone/bot/pathing/movement/MovementHelper.java
View File

@ -100,7 +100,7 @@ public interface MovementHelper extends ActionCosts, Helper {
} }
if (playerPos.north().equals(doorPos) || playerPos.south().equals(doorPos)) { if (playerPos.north().equals(doorPos) || playerPos.south().equals(doorPos)) {
playerFacing = "northsouth"; playerFacing = "northsouth";
} else if (playerPos.east().equals(doorPos) || playerPos.west().equals(doorPos)){ } else if (playerPos.east().equals(doorPos) || playerPos.west().equals(doorPos)) {
playerFacing = "eastwest"; playerFacing = "eastwest";
} else { } else {
return true; return true;
@ -174,9 +174,6 @@ public interface MovementHelper extends ActionCosts, Helper {
if (avoidBreaking(position)) { if (avoidBreaking(position)) {
return COST_INF; return COST_INF;
} }
//if (!Baritone.allowBreakOrPlace) {
// return COST_INF;
//}
double m = Blocks.CRAFTING_TABLE.equals(block) ? 10 : 1; double m = Blocks.CRAFTING_TABLE.equals(block) ? 10 : 1;
return m / ts.getStrVsBlock(state, position); return m / ts.getStrVsBlock(state, position);
} }

1
src/main/java/baritone/bot/pathing/movement/movements/MovementTraverse.java
View File

@ -140,6 +140,7 @@ public class MovementTraverse extends Movement {
isDoorActuallyBlockingUs = true; isDoorActuallyBlockingUs = true;
} }
if (isDoorActuallyBlockingUs) { if (isDoorActuallyBlockingUs) {
state.setTarget(new MovementState.MovementTarget(Utils.calcRotationFromVec3d(playerHead(), Utils.calcCenterFromCoords(positionsToBreak[0], world()))));
state.setInput(InputOverrideHandler.Input.CLICK_RIGHT, true); state.setInput(InputOverrideHandler.Input.CLICK_RIGHT, true);
return state; return state;
} }

1
src/main/java/baritone/bot/utils/Utils.java
View File

@ -83,7 +83,6 @@ public final class Utils {
if (b.getBlock() instanceof BlockFire) {//look at bottom of fire when putting it out if (b.getBlock() instanceof BlockFire) {//look at bottom of fire when putting it out
yDiff = 0; yDiff = 0;
} }
System.out.println(xDiff + " " + yDiff + " " + zDiff);
return new Vec3d( return new Vec3d(
orig.getX() + xDiff, orig.getX() + xDiff,
orig.getY() + yDiff, orig.getY() + yDiff,