Skip to content

Commit 55e088b

Browse files
committed
Align RayTracer.retraceBlock with vanilla path.
1 parent 8678821 commit 55e088b

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

src/main/java/codechicken/lib/raytracer/RayTracer.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,19 @@ public class RayTracer {
1616

1717
@Nullable
1818
public static BlockHitResult retraceBlock(BlockGetter level, Player player, BlockPos pos) {
19+
return retraceBlock(level, player, pos, ClipContext.Block.OUTLINE);
20+
}
21+
22+
@Nullable
23+
public static BlockHitResult retraceBlock(BlockGetter level, Player player, BlockPos pos, ClipContext.Block context) {
1924
Vec3 startVec = getStartVec(player);
2025
Vec3 endVec = getEndVec(player);
26+
2127
BlockState state = level.getBlockState(pos);
22-
VoxelShape baseShape = state.getShape(level, pos);
28+
VoxelShape baseShape = context.get(state, level, pos, CollisionContext.of(player));
2329
BlockHitResult baseTraceResult = baseShape.clip(startVec, endVec, pos);
2430
if (baseTraceResult != null) {
25-
BlockHitResult raytraceTraceShape = state.getVisualShape(level, pos, CollisionContext.of(player)).clip(startVec, endVec, pos);
31+
BlockHitResult raytraceTraceShape = state.getInteractionShape(level, pos).clip(startVec, endVec, pos);
2632
if (raytraceTraceShape != null) {
2733
return raytraceTraceShape;
2834
}

0 commit comments

Comments
 (0)