mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 19:49:35 +01:00
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
--- a/net/minecraft/world/level/RayTrace.java
|
|
+++ b/net/minecraft/world/level/RayTrace.java
|
|
@@ -22,7 +22,7 @@
|
|
private final VoxelShapeCollision collisionContext;
|
|
|
|
public RayTrace(Vec3D vec3d, Vec3D vec3d1, RayTrace.BlockCollisionOption raytrace_blockcollisionoption, RayTrace.FluidCollisionOption raytrace_fluidcollisionoption, Entity entity) {
|
|
- this(vec3d, vec3d1, raytrace_blockcollisionoption, raytrace_fluidcollisionoption, VoxelShapeCollision.of(entity));
|
|
+ this(vec3d, vec3d1, raytrace_blockcollisionoption, raytrace_fluidcollisionoption, (entity == null) ? VoxelShapeCollision.empty() : VoxelShapeCollision.of(entity)); // CraftBukkit
|
|
}
|
|
|
|
public RayTrace(Vec3D vec3d, Vec3D vec3d1, RayTrace.BlockCollisionOption raytrace_blockcollisionoption, RayTrace.FluidCollisionOption raytrace_fluidcollisionoption, VoxelShapeCollision voxelshapecollision) {
|
|
@@ -79,7 +79,7 @@
|
|
|
|
private final Predicate<Fluid> canPick;
|
|
|
|
- private FluidCollisionOption(Predicate predicate) {
|
|
+ private FluidCollisionOption(Predicate<Fluid> predicate) { // CraftBukkit - decompile error
|
|
this.canPick = predicate;
|
|
}
|
|
|