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..6e0dad761d8b3623c04fcaf8e3e1d1f26bcc3a1b 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,21 @@ 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,17 @@ 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 6e0dad761d8b3623c04fcaf8e3e1d1f26bcc3a1b..ff79b5bb9394e9e14f923e1af8b22e3b7b3cd622 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 {
@@ -43,7 +43,7 @@ index 9209f5509affbd3cbcf777b75b0868c898ee913f..5dc286093f0befdb0988427f6134f752
      }
 
      private void applyDamage(int damage, @Nullable LivingEntity player, Consumer<Item> breakCallback) { // Paper - Add EntityDamageItemEvent
-@@ -781,6 +791,11 @@ public final class ItemStack implements DataComponentHolder {
+@@ -782,6 +792,11 @@ public final class ItemStack implements DataComponentHolder {
      }
 
      public void hurtAndBreak(int amount, LivingEntity entity, EquipmentSlot slot) {
@@ -55,7 +55,7 @@ index 9209f5509affbd3cbcf777b75b0868c898ee913f..5dc286093f0befdb0988427f6134f752
          Level world = entity.level();
 
          if (world instanceof ServerLevel worldserver) {
-@@ -793,8 +808,8 @@ public final class ItemStack implements DataComponentHolder {
+@@ -794,8 +809,8 @@ public final class ItemStack implements DataComponentHolder {
              }
 
              this.hurtAndBreak(amount, worldserver, entity, (item) -> { // Paper - Add EntityDamageItemEvent

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

@@ -12,10 +12,10 @@ 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 07642c2db2e467fc8fbc04b219366ed1ed418c38..37801a5f39b2c9e7b7fef21d5dbf1a742883c159 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 {
+@@ -1390,6 +1390,11 @@ public final class ItemStack implements DataComponentHolder {
      public void setItem(Item item) {
          this.bukkitStack = null; // Paper
          this.item = item;

patches/server/1044-Optimize-Hoppers.patch

@@ -62,10 +62,10 @@ 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 99ea2cab389b5dd777c13b982dec4ed65e44a22d..a3a57941b272b8f1db410c67378f7e3fb3d2c17e 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 {
+@@ -897,10 +897,16 @@ public final class ItemStack implements DataComponentHolder {
      }
 
      public ItemStack copy() {