mirror of https://github.com/cabaletta/baritone
Merge pull request #3308 from wagyourtail/1.17.1
fix `<parameter1> is null`
This commit is contained in:
commit
477e3a706b
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
@ -99,7 +99,7 @@ public interface MovementHelper extends ActionCosts, Helper {
|
||||||
if (block instanceof AirBlock) { // early return for most common case
|
if (block instanceof AirBlock) { // early return for most common case
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (block instanceof BaseFireBlock || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock || block == Blocks.HONEY_BLOCK || block == Blocks.END_ROD || block == Blocks.POINTED_DRIPSTONE || block == Blocks.AMETHYST_CLUSTER || block instanceof AmethystClusterBlock || block instanceof AzaleaBlock) {
|
if (block instanceof BaseFireBlock || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock || block == Blocks.HONEY_BLOCK || block == Blocks.END_ROD || block == Blocks.SWEET_BERRY_BUSH || block == Blocks.POINTED_DRIPSTONE || block instanceof AmethystClusterBlock || block instanceof AzaleaBlock) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (block == Blocks.BIG_DRIPLEAF) {
|
if (block == Blocks.BIG_DRIPLEAF) {
|
||||||
|
@ -291,6 +291,7 @@ public interface MovementHelper extends ActionCosts, Helper {
|
||||||
return !state.getFluidState().isEmpty()
|
return !state.getFluidState().isEmpty()
|
||||||
|| block == Blocks.MAGMA_BLOCK
|
|| block == Blocks.MAGMA_BLOCK
|
||||||
|| block == Blocks.CACTUS
|
|| block == Blocks.CACTUS
|
||||||
|
|| block == Blocks.SWEET_BERRY_BUSH
|
||||||
|| block instanceof BaseFireBlock
|
|| block instanceof BaseFireBlock
|
||||||
|| block == Blocks.END_PORTAL
|
|| block == Blocks.END_PORTAL
|
||||||
|| block == Blocks.COBWEB
|
|| block == Blocks.COBWEB
|
||||||
|
|
|
@ -847,7 +847,18 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// <toxic cloud>
|
// <toxic cloud>
|
||||||
result.add(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockPlaceContext(new UseOnContext(ctx.world(), ctx.player(), InteractionHand.MAIN_HAND, stack, new BlockHitResult(new Vec3(ctx.player().position().x, ctx.player().position().y, ctx.player().position().z), Direction.UP, ctx.playerFeet(), false)) {})));
|
BlockState itemState = ((BlockItem) stack.getItem())
|
||||||
|
.getBlock()
|
||||||
|
.getStateForPlacement(
|
||||||
|
new BlockPlaceContext(
|
||||||
|
new UseOnContext(ctx.world(), ctx.player(), InteractionHand.MAIN_HAND, stack, new BlockHitResult(new Vec3(ctx.player().position().x, ctx.player().position().y, ctx.player().position().z), Direction.UP, ctx.playerFeet(), false)) {}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
if (itemState != null) {
|
||||||
|
result.add(itemState);
|
||||||
|
} else {
|
||||||
|
result.add(Blocks.AIR.defaultBlockState());
|
||||||
|
}
|
||||||
// </toxic cloud>
|
// </toxic cloud>
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Reference in New Issue