SPIGOT-4369: Handle cancelled trident event

2024-11-25 08:38:45 +01:00 · 2018-09-15 15:31:39 +10:00 · 2018-09-15 15:31:39 +10:00 · 97315374fb
commit 97315374fb
parent bf1c82731c
1 changed files with 18 additions and 1 deletions
--- 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) {