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

two small tweaks

Browse Source
This commit is contained in:
Leijurv 2019-01-10 13:50:53 -08:00
parent 1dca02517e
commit 1381d8d94c
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/baritone/pathing/movement/movements/MovementPillar.java
View File

@ -82,6 +82,9 @@ public class MovementPillar extends Movement {
if (placeCost >= COST_INF) { if (placeCost >= COST_INF) {
return COST_INF; return COST_INF;
} }
if (fromDown.getBlock() == Blocks.AIR) {
placeCost += 0.1; // slightly (1/200th of a second) penalize pillaring on what's currently air
}
} }
if (from instanceof BlockLiquid || (fromDown.getBlock() instanceof BlockLiquid && context.assumeWalkOnWater)) { if (from instanceof BlockLiquid || (fromDown.getBlock() instanceof BlockLiquid && context.assumeWalkOnWater)) {
// otherwise, if we're standing in water, we cannot pillar // otherwise, if we're standing in water, we cannot pillar

3
src/main/java/baritone/utils/PathingControlManager.java
View File

@ -82,11 +82,12 @@ public class PathingControlManager implements IPathingControlManager {
public void preTick() { public void preTick() {
inControlLastTick = inControlThisTick; inControlLastTick = inControlThisTick;
PathingBehavior p = baritone.getPathingBehavior();
command = doTheStuff(); command = doTheStuff();
if (command == null) { if (command == null) {
p.cancelSegmentIfSafe();
return; return;
} }
PathingBehavior p = baritone.getPathingBehavior();
switch (command.commandType) { switch (command.commandType) {
case REQUEST_PAUSE: case REQUEST_PAUSE:
p.requestPause(); p.requestPause();