--- a/net/minecraft/world/level/ClipContext.java
+++ b/net/minecraft/world/level/ClipContext.java
@@ -22,7 +22,7 @@
     private final CollisionContext collisionContext;
 
     public ClipContext(Vec3 start, Vec3 end, ClipContext.Block shapeType, ClipContext.Fluid fluidHandling, Entity entity) {
-        this(start, end, shapeType, fluidHandling, CollisionContext.of(entity));
+        this(start, end, shapeType, fluidHandling, (entity == null) ? CollisionContext.empty() : CollisionContext.of(entity)); // CraftBukkit
     }
 
     public ClipContext(Vec3 start, Vec3 end, ClipContext.Block shapeType, ClipContext.Fluid fluidHandling, CollisionContext shapeContext) {
@@ -79,7 +79,7 @@
 
         private final Predicate<FluidState> canPick;
 
-        private Fluid(final Predicate predicate) {
+        private Fluid(final Predicate<FluidState> predicate) { // CraftBukkit - decompile error
             this.canPick = predicate;
         }