From add5a47931ce83166c415ea7e46868753df2093f Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 13 Dec 2025 23:21:36 -0500 Subject: [PATCH 1/2] Change thrown trident item to use copy of ItemStack of count 1 --- .../sources/net/minecraft/world/item/TridentItem.java.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paper-server/patches/sources/net/minecraft/world/item/TridentItem.java.patch b/paper-server/patches/sources/net/minecraft/world/item/TridentItem.java.patch index ca4276800c5e..93c678733342 100644 --- a/paper-server/patches/sources/net/minecraft/world/item/TridentItem.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/item/TridentItem.java.patch @@ -22,9 +22,9 @@ + } + ThrownTrident thrownTrident = tridentDelayed.projectile(); // Paper - PlayerLaunchProjectileEvent + if (event.shouldConsume()) { -+ stack.hurtWithoutBreaking(1, player); // Paper - PlayerLaunchProjectileEvent ++ itemStack.hurtWithoutBreaking(1, player); // Paper - PlayerLaunchProjectileEvent // Paper use itemStack; pickup item damage + } -+ thrownTrident.pickupItemStack = stack.copy(); // SPIGOT-4511 update since damage call moved ++ thrownTrident.pickupItemStack = itemStack.copy(); // SPIGOT-4511 update since damage call moved // Paper use itemStack; count = 1 + if (event.shouldConsume()) { + stack.consume(1, player); + } From 73651cd075fb11e585f5861a7d8e23e5c69c02f3 Mon Sep 17 00:00:00 2001 From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Sun, 4 Jan 2026 16:24:27 -0500 Subject: [PATCH 2/2] Fix paper comments --- .../sources/net/minecraft/world/item/TridentItem.java.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paper-server/patches/sources/net/minecraft/world/item/TridentItem.java.patch b/paper-server/patches/sources/net/minecraft/world/item/TridentItem.java.patch index 93c678733342..34ac38899186 100644 --- a/paper-server/patches/sources/net/minecraft/world/item/TridentItem.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/item/TridentItem.java.patch @@ -22,9 +22,9 @@ + } + ThrownTrident thrownTrident = tridentDelayed.projectile(); // Paper - PlayerLaunchProjectileEvent + if (event.shouldConsume()) { -+ itemStack.hurtWithoutBreaking(1, player); // Paper - PlayerLaunchProjectileEvent // Paper use itemStack; pickup item damage ++ itemStack.hurtWithoutBreaking(1, player); // Paper - PlayerLaunchProjectileEvent - use itemStack; pickup item damage + } -+ thrownTrident.pickupItemStack = itemStack.copy(); // SPIGOT-4511 update since damage call moved // Paper use itemStack; count = 1 ++ thrownTrident.pickupItemStack = itemStack.copy(); // SPIGOT-4511 update since damage call moved - use itemStack; count = 1 + if (event.shouldConsume()) { + stack.consume(1, player); + }