From 97315374fb5a017352f12858ad93c701dd4b11d7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 15 Sep 2018 15:31:39 +1000
Subject: [PATCH] SPIGOT-4369: Handle cancelled trident event

---
 nms-patches/ItemTrident.patch | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/nms-patches/ItemTrident.patch b/nms-patches/ItemTrident.patch
index 7de03dd633..f4b26b0006 100644
--- a/nms-patches/ItemTrident.patch
+++ b/nms-patches/ItemTrident.patch
@@ -14,7 +14,24 @@
      }
  
      public boolean a(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman) {
-@@ -53,6 +57,10 @@
+@@ -42,7 +46,15 @@
+                                 entitythrowntrident.fromPlayer = EntityArrow.PickupStatus.CREATIVE_ONLY;
+                             }
+ 
+-                            world.addEntity(entitythrowntrident);
++                            // CraftBukkit start
++                            if (!world.addEntity(entitythrowntrident)) {
++                                if (entityhuman instanceof EntityPlayer) {
++                                    ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
++                                }
++                                return;
++                            }
++                            // CraftBukkit end
++
+                             if (!entityhuman.abilities.canInstantlyBuild) {
+                                 entityhuman.inventory.f(itemstack);
+                             }
+@@ -53,6 +65,10 @@
                      SoundEffect soundeffect = SoundEffects.ITEM_TRIDENT_THROW;
  
                      if (k > 0) {