allow breaking trident

Author: notTamion

patches/server/0680-Expand-PlayerItemDamageEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expand PlayerItemDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 18f84d54ec72debec652adb22067e11aa058b238..9209f5509affbd3cbcf777b75b0868c898ee913f 100644
+index 18f84d54ec72debec652adb22067e11aa058b238..cdfa19d1bc2cdd8210f4f93d6457806296d0f73b 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -698,10 +698,11 @@ public final class ItemStack implements DataComponentHolder {
@@ -21,20 +21,20 @@ index 18f84d54ec72debec652adb22067e11aa058b238..9209f5509affbd3cbcf777b75b0868c8
              event.getPlayer().getServer().getPluginManager().callEvent(event);
 
              if (j != event.getDamage() || event.isCancelled()) {
-@@ -761,6 +762,16 @@ public final class ItemStack implements DataComponentHolder {
-                 return;
-             }
+@@ -763,6 +764,16 @@ public final class ItemStack implements DataComponentHolder {
+ 
+             int k = Math.min(this.getDamageValue() + j, this.getMaxDamage() - 1);
 
 +            // Paper start - Expand PlayerItemDamageEvent
-+            if (j > 0) {
-+                PlayerItemDamageEvent event = new PlayerItemDamageEvent(entityplayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j, amount);
++            if (k - this.getDamageValue() > 0) {
++                PlayerItemDamageEvent event = new PlayerItemDamageEvent(entityplayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), k - this.getDamageValue(), amount);
 +                if (!event.callEvent() || event.getDamage() == 0) {
 +                    return;
 +                }
-+                j = event.getDamage();
++                k = event.getDamage() + this.getDamageValue();
 +            }
 +            // Paper end - Expand PlayerItemDamageEvent
 +
-             int k = Math.min(this.getDamageValue() + j, this.getMaxDamage() - 1);
- 
              this.applyDamage(k, entityplayer, (item) -> {
+             });
+         }

patches/server/0756-ItemStack-damage-API.patch

@@ -11,7 +11,7 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 9209f5509affbd3cbcf777b75b0868c898ee913f..5dc286093f0befdb0988427f6134f752e62d0dc5 100644
+index bdffbbade36122d3dbc1c1f580c8cf3254905d7a..08944b4fba24d35b242fc0442894e873efa72960 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -698,8 +698,13 @@ public final class ItemStack implements DataComponentHolder {

patches/server/0947-General-ItemMeta-fixes.patch

@@ -12,7 +12,7 @@ public net/minecraft/world/level/block/entity/BlockEntity saveId(Lnet/minecraft/
 Co-authored-by: GhastCraftHD <julius.gruenberg@leghast.de>
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 6c1b81967fe32802c895e3f9f8e199588c36be7f..4c684b665180f8485131542b161483c77c40b4ec 100644
+index e09fc5481b5b78ad33f0a0ff3c601b750bdceac1..767bcfdee24f62d262912875293b4e4b2e097eb5 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -1389,6 +1389,11 @@ public final class ItemStack implements DataComponentHolder {

patches/server/1044-Optimize-Hoppers.patch

@@ -62,7 +62,7 @@ index 682417e20459ffd576e494e1a279c477589103ba..ccbd76a7d1a3c29759aec86c5780cab6
              gameprofilerfiller.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 57a5c7c26c77cb961f7b7a11ff866f65d042934c..1f05ab1aabae0ce4fae49e790833b8b6038263bb 100644
+index 0d74cc161c5797e159dff9204e57fe35a59e5256..9c6168896b65cc0bf671b7296920a91bbd9e0a93 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -896,10 +896,16 @@ public final class ItemStack implements DataComponentHolder {