Skip to content

Fix BetterBlockPos leaking into block entity map, fixes #4307 #4999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mankool0 wants to merge 1 commit into from
+8 −0
Closed

Fix BetterBlockPos leaking into block entity map, fixes #4307 #4999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/api/java/baritone/api/utils/RotationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos, dou
}

public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
// Prevent BetterBlockPos from leaking into Minecraft's block entity map
if (pos instanceof BetterBlockPos) {
pos = new BlockPos(pos.getX(), pos.getY(), pos.getZ());
}
if (BaritoneAPI.getSettings().remainWithExistingLookDirection.value && ctx.isLookingAt(pos)) {
/*
* why add 0.0001?
Expand Down
4 changes: 4 additions & 0 deletions src/api/java/baritone/api/utils/VecUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ private VecUtils() {}
* @see #getBlockPosCenter(BlockPos)
*/
public static Vec3 calculateBlockCenter(Level world, BlockPos pos) {
// Prevent BetterBlockPos from leaking into Minecraft's block entity map
if (pos instanceof BetterBlockPos) {
pos = new BlockPos(pos.getX(), pos.getY(), pos.getZ());
}
BlockState b = world.getBlockState(pos);
VoxelShape shape = b.getCollisionShape(world, pos);
if (shape.isEmpty()) {
Expand Down
Loading