--- a/net/minecraft/server/ItemCrossbow.java
+++ b/net/minecraft/server/ItemCrossbow.java
@@ -12,6 +12,8 @@
 
     public ItemCrossbow(Item.Info item_info) {
         super(item_info);
+        // CraftBukkit start - obfuscator went a little crazy
+        /*
         this.a(new MinecraftKey("pull"), (itemstack, world, entityliving) -> {
             return entityliving != null && itemstack.getItem() == this ? (d(itemstack) ? 0.0F : (float) (itemstack.k() - entityliving.dm()) / (float) e(itemstack)) : 0.0F;
         });
@@ -24,6 +26,8 @@
         this.a(new MinecraftKey("firework"), (itemstack, world, entityliving) -> {
             return entityliving != null && d(itemstack) && a(itemstack, Items.FIREWORK_ROCKET) ? 1.0F : 0.0F;
         });
+        */
+        // CraftBukkit end
     }
 
     @Override
@@ -88,6 +92,11 @@
                 itemstack1 = new ItemStack(Items.ARROW);
                 itemstack2 = itemstack1.cloneItemStack();
             }
+            // CraftBukkit start - SPIGOT-4870, MC-150847
+            else if (itemstack1.isEmpty()) {
+                return;
+            }
+            // CraftBukkit end
 
             a(entityliving, itemstack, itemstack1, k > 0, flag);
         }
@@ -203,11 +212,27 @@
                 vector3fa.a(quaternion);
                 ((IProjectile) object).shoot((double) vector3fa.a(), (double) vector3fa.b(), (double) vector3fa.c(), f1, f2);
             }
+            // CraftBukkit start
+            org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityliving, itemstack, (Entity) object, f);
+            if (event.isCancelled()) {
+                event.getProjectile().remove();
+                return;
+            }
+            // CraftBukkit end
 
             itemstack.damage(flag1 ? 3 : 1, entityliving, (entityliving1) -> {
                 entityliving1.d(enumhand);
             });
-            world.addEntity((Entity) object);
+            // CraftBukkit start
+            if (event.getProjectile() == ((Entity) object).getBukkitEntity()) {
+                if (!world.addEntity((Entity) object)) {
+                    if (entityliving instanceof EntityPlayer) {
+                        ((EntityPlayer) entityliving).getBukkitEntity().updateInventory();
+                    }
+                    return;
+                }
+            }
+            // CraftBukkit end
             world.a((EntityHuman) null, entityliving.locX, entityliving.locY, entityliving.locZ, SoundEffects.ITEM_CROSSBOW_SHOOT, SoundCategory.PLAYERS, 1.0F, f);
         }
     }