--- a/net/minecraft/world/level/RayTrace.java
+++ b/net/minecraft/world/level/RayTrace.java
@@ -24,7 +24,7 @@
         this.to = vec3d1;
         this.block = raytrace_blockcollisionoption;
         this.fluid = raytrace_fluidcollisionoption;
-        this.collisionContext = VoxelShapeCollision.a(entity);
+        this.collisionContext = (entity == null) ? VoxelShapeCollision.a() : VoxelShapeCollision.a(entity); // CraftBukkit
     }
 
     public Vec3D a() {
@@ -69,7 +69,7 @@
 
         private final Predicate<Fluid> canPick;
 
-        private FluidCollisionOption(Predicate predicate) {
+        private FluidCollisionOption(Predicate<Fluid> predicate) { // CraftBukkit - decompile error
             this.canPick = predicate;
         }
 
