SPIGOT-4511: Trident doesn't lose durability

By: md_5 <git@md-5.net>
2018-12-01 08:18:09 +11:00
parent 44708f20d8
commit 78841baf49
3 changed files with 18 additions and 7 deletions
--- a/paper-server/nms-patches/ItemTrident.patch
+++ b/paper-server/nms-patches/ItemTrident.patch
@@ -23,7 +23,7 @@
                         if (k == 0) {
                             EntityThrownTrident entitythrowntrident = new EntityThrownTrident(world, entityhuman, itemstack);
 
-@@ -42,7 +46,17 @@
+@@ -42,7 +46,18 @@
                                 entitythrowntrident.fromPlayer = EntityArrow.PickupStatus.CREATIVE_ONLY;
                             }
 
@@ -37,12 +37,13 @@
 +                            }
 +
 +                            itemstack.damage(1, entityhuman);
+                            entitythrowntrident.aw = itemstack.cloneItemStack(); // SPIGOT-4511 update since damage call moved
 +                            // CraftBukkit end
 +
                             if (!entityhuman.abilities.canInstantlyBuild) {
                                 entityhuman.inventory.f(itemstack);
                             }
-@@ -53,6 +67,10 @@
+@@ -53,6 +68,10 @@
                     SoundEffect soundeffect = SoundEffects.ITEM_TRIDENT_THROW;
 
                     if (k > 0) {