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

fix default case that instantiated an optional for non stairs

Browse Source
This commit is contained in:
Leijurv 2022-07-14 21:38:02 -07:00
parent 85ab317c6c
commit 8018dac396
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/baritone/pathing/movement/MovementHelper.java
View File

@ -30,7 +30,6 @@ import baritone.utils.ToolSet;
import net.minecraft.block.*; import net.minecraft.block.*;
import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -48,8 +47,9 @@ import static baritone.pathing.movement.Movement.HORIZONTALS_BUT_ALSO_DOWN_____S
* @author leijurv * @author leijurv
*/ */
public interface MovementHelper extends ActionCosts, Helper { public interface MovementHelper extends ActionCosts, Helper {
static final Optional<Boolean> TRUE = Optional.of(true);
static final Optional<Boolean> FALSE = Optional.of(false); Optional<Boolean> TRUE = Optional.of(true);
Optional<Boolean> FALSE = Optional.of(false);
static boolean avoidBreaking(BlockStateInterface bsi, int x, int y, int z, IBlockState state) { static boolean avoidBreaking(BlockStateInterface bsi, int x, int y, int z, IBlockState state) {
if (!bsi.worldBorder.canPlaceAt(x, y)) { if (!bsi.worldBorder.canPlaceAt(x, y)) {
@ -333,7 +333,7 @@ public interface MovementHelper extends ActionCosts, Helper {
* Can I walk on this block without anything weird happening like me falling * Can I walk on this block without anything weird happening like me falling
* through? Includes water because we know that we automatically jump on * through? Includes water because we know that we automatically jump on
* water * water
* * <p>
* If changing something in this function remember to also change it in precomputed data * If changing something in this function remember to also change it in precomputed data
* *
* @param bsi Block state provider * @param bsi Block state provider
@ -389,7 +389,11 @@ public interface MovementHelper extends ActionCosts, Helper {
return TRUE; return TRUE;
} }
return Optional.of(block instanceof BlockStairs); if (block instanceof BlockStairs) {
return TRUE;
}
return FALSE;
} }
static boolean canWalkOnPosition(BlockStateInterface bsi, int x, int y, int z, IBlockState state) { static boolean canWalkOnPosition(BlockStateInterface bsi, int x, int y, int z, IBlockState state) {