SPIGOT-4371: Trident damaged when event cancelled

nms-patches/ItemTrident.patch

@@ -14,7 +14,16 @@
      }
  
      public boolean a(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman) {
-@@ -42,7 +46,15 @@
+@@ -33,7 +37,7 @@
+ 
+                 if (k <= 0 || entityhuman.ao()) {
+                     if (!world.isClientSide) {
+-                        itemstack.damage(1, entityhuman);
++                        // itemstack.damage(1, entityhuman); // CraftBukkit - moved down
+                         if (k == 0) {
+                             EntityThrownTrident entitythrowntrident = new EntityThrownTrident(world, entityhuman, itemstack);
+ 
+@@ -42,7 +46,17 @@
                                  entitythrowntrident.fromPlayer = EntityArrow.PickupStatus.CREATIVE_ONLY;
                              }
  
@@ -26,12 +35,14 @@
 +                                }
 +                                return;
 +                            }
++
++                            itemstack.damage(1, entityhuman);
 +                            // CraftBukkit end
 +
                              if (!entityhuman.abilities.canInstantlyBuild) {
                                  entityhuman.inventory.f(itemstack);
                              }
-@@ -53,6 +65,10 @@
+@@ -53,6 +67,10 @@
                      SoundEffect soundeffect = SoundEffects.ITEM_TRIDENT_THROW;
  
                      if (k > 0) {