merge master

This commit is contained in:
Leijurv 2018-09-06 07:48:46 -07:00
commit 5e063f56a2
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 8 additions and 1 deletions

View File

@ -17,6 +17,14 @@ the original version of the bot for Minecraft 1.8, rebuilt for 1.12.2.
## Command Line ## Command Line
On Mac OSX and Linux, use `./gradlew` instead of `gradlew`. On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.
Running Baritone:
```
$ gradlew run
```
Setting up for IntelliJ:
``` ```
$ gradlew setupDecompWorkspace $ gradlew setupDecompWorkspace
$ gradlew --refresh-dependencies $ gradlew --refresh-dependencies

View File

@ -46,7 +46,6 @@ public class CalculationContext implements Helper {
} }
public CalculationContext(ToolSet toolSet) { public CalculationContext(ToolSet toolSet) {
player().setSprinting(true);
this.toolSet = toolSet; this.toolSet = toolSet;
this.hasThrowaway = Baritone.settings().allowPlace.get() && MovementHelper.throwaway(false); this.hasThrowaway = Baritone.settings().allowPlace.get() && MovementHelper.throwaway(false);
this.hasWaterBucket = Baritone.settings().allowWaterBucketFall.get() && InventoryPlayer.isHotbar(player().inventory.getSlotFor(STACK_BUCKET_WATER)) && !world().provider.isNether(); this.hasWaterBucket = Baritone.settings().allowWaterBucketFall.get() && InventoryPlayer.isHotbar(player().inventory.getSlotFor(STACK_BUCKET_WATER)) && !world().provider.isNether();