--- a/net/minecraft/world/item/ItemEnderPearl.java
+++ b/net/minecraft/world/item/ItemEnderPearl.java
@@ -19,16 +19,24 @@
     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.ENDER_PEARL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
-        entityhuman.getCooldownTracker().setCooldown(this, 20);
+        // CraftBukkit start - change order
         if (!world.isClientSide) {
             EntityEnderPearl entityenderpearl = new EntityEnderPearl(world, entityhuman);
 
             entityenderpearl.setItem(itemstack);
             entityenderpearl.a(entityhuman, entityhuman.getXRot(), entityhuman.getYRot(), 0.0F, 1.5F, 1.0F);
-            world.addEntity(entityenderpearl);
+            if (!world.addEntity(entityenderpearl)) {
+                if (entityhuman instanceof net.minecraft.server.level.EntityPlayer) {
+                    ((net.minecraft.server.level.EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
+                }
+                return InteractionResultWrapper.fail(itemstack);
+            }
         }
 
+        world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENDER_PEARL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
+        entityhuman.getCooldownTracker().setCooldown(this, 20);
+        // CraftBukkit end
+
         entityhuman.b(StatisticList.ITEM_USED.b(this));
         if (!entityhuman.getAbilities().instabuild) {
             itemstack.subtract(1);
