diff --git a/nms-patches/ItemEgg.patch b/nms-patches/ItemEgg.patch
new file mode 100644
index 0000000000..1d8ea9d8dc
--- /dev/null
+++ b/nms-patches/ItemEgg.patch
@@ -0,0 +1,27 @@
+--- a/net/minecraft/server/ItemEgg.java
++++ b/net/minecraft/server/ItemEgg.java
+@@ -10,14 +10,22 @@
+     public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
+         ItemStack itemstack = entityhuman.b(enumhand);
+ 
+-        world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_EGG_THROW, SoundCategory.PLAYERS, 0.5F, 0.4F / (ItemEgg.i.nextFloat() * 0.4F + 0.8F));
++        // world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_EGG_THROW, SoundCategory.PLAYERS, 0.5F, 0.4F / (ItemEgg.i.nextFloat() * 0.4F + 0.8F)); // CraftBukkit - moved down
+         if (!world.isClientSide) {
+             EntityEgg entityegg = new EntityEgg(world, entityhuman);
+ 
+             entityegg.setItem(itemstack);
+             entityegg.a(entityhuman, entityhuman.pitch, entityhuman.yaw, 0.0F, 1.5F, 1.0F);
+-            world.addEntity(entityegg);
++            // CraftBukkit start
++            if (!world.addEntity(entityegg)) {
++                if (entityhuman instanceof EntityPlayer) {
++                    ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
++                }
++                return InteractionResultWrapper.fail(itemstack);
++            }
++            // CraftBukkit end
+         }
++        world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_EGG_THROW, SoundCategory.PLAYERS, 0.5F, 0.4F / (ItemEgg.i.nextFloat() * 0.4F + 0.8F)); // CraftBukkit - from above
+ 
+         entityhuman.b(StatisticList.ITEM_USED.b(this));
+         if (!entityhuman.abilities.canInstantlyBuild) {
diff --git a/nms-patches/ItemSnowball.patch b/nms-patches/ItemSnowball.patch
index 418d99fe7d..01d836c7f5 100644
--- a/nms-patches/ItemSnowball.patch
+++ b/nms-patches/ItemSnowball.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/ItemSnowball.java
 +++ b/net/minecraft/server/ItemSnowball.java
-@@ -10,19 +10,31 @@
+@@ -10,19 +10,32 @@
      public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
          ItemStack itemstack = entityhuman.b(enumhand);
  
@@ -18,7 +18,8 @@
 +                    itemstack.subtract(1);
 +                }
 +
-+                world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemSnowball.i.nextFloat() * 0.4F + 0.8F));            } else if (entityhuman instanceof EntityPlayer) {
++                world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemSnowball.i.nextFloat() * 0.4F + 0.8F));
++            } else if (entityhuman instanceof EntityPlayer) {
 +                ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
 +            }
          }