Fix ItemDamageEvents called for 0 damage

patches/server/0569-Add-EntityDamageItemEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityDamageItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index f00b756fe5dad616323e3b11e35e27353f347042..8c9ae9ac38def29ae4cd8944395e566e434d46d0 100644
+index f00b756fe5dad616323e3b11e35e27353f347042..4df27601c4502b90a9a9e4ccc340dfcb37a6a79c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -692,11 +692,11 @@ public final class ItemStack implements DataComponentHolder {
@@ -18,17 +18,17 @@ index f00b756fe5dad616323e3b11e35e27353f347042..8c9ae9ac38def29ae4cd8944395e566e
          // CraftBukkit start
 -        if (player != null) {
 -            PlayerItemDamageEvent event = new PlayerItemDamageEvent(player.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j);
-+        if (player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
++        if (j > 0 && player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent - limit to positive damage and run for player
 +            PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j); // Paper - Add EntityDamageItemEvent
              event.getPlayer().getServer().getPluginManager().callEvent(event);
 
              if (j != event.getDamage() || event.isCancelled()) {
-@@ -707,6 +707,14 @@ public final class ItemStack implements DataComponentHolder {
+@@ -707,30 +707,38 @@ public final class ItemStack implements DataComponentHolder {
              }
 
              j = event.getDamage();
 +            // Paper start - Add EntityDamageItemEvent
-+        } else if (player != null) {
++        } else if (j > 0 && player != null) {
 +            io.papermc.paper.event.entity.EntityDamageItemEvent event = new io.papermc.paper.event.entity.EntityDamageItemEvent(player.getBukkitLivingEntity(), CraftItemStack.asCraftMirror(this), amount);
 +            if (!event.callEvent()) {
 +                return;
@@ -38,7 +38,10 @@ index f00b756fe5dad616323e3b11e35e27353f347042..8c9ae9ac38def29ae4cd8944395e566e
          }
          // CraftBukkit end
 
-@@ -716,21 +724,21 @@ public final class ItemStack implements DataComponentHolder {
+-        if (j != 0) {
++        if (j != 0) { // Paper - Add EntityDamageItemEvent - diff on change for above event ifs.
+             this.applyDamage(this.getDamageValue() + j, player, breakCallback);
+         }
 
      }
 

patches/server/0685-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 a100c7a53b4b1dac0a01ee65418d44297bcdb93f..bcb3a45166e5dd75dd727adf92304b3a75399c8d 100644
+index 7ebe03c592789c6a74eb3c12045e40c3d6d5f50c..b591ded5f7c7726c6bd3923f3b8243b08b3569c4 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -693,10 +693,11 @@ public final class ItemStack implements DataComponentHolder {
@@ -15,7 +15,7 @@ index a100c7a53b4b1dac0a01ee65418d44297bcdb93f..bcb3a45166e5dd75dd727adf92304b3a
 +        int originalDamage = amount; // Paper - Expand PlayerItemDamageEvent
          int j = this.processDurabilityChange(amount, world, player);
          // CraftBukkit start
-         if (player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
+         if (j > 0 && player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent - limit to positive damage and run for player
 -            PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j); // Paper - Add EntityDamageItemEvent
 +            PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j, originalDamage); // Paper - Add EntityDamageItemEvent
              event.getPlayer().getServer().getPluginManager().callEvent(event);

patches/server/0761-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 bcb3a45166e5dd75dd727adf92304b3a75399c8d..90a55f00c36903d52630c51bf69322973a2b5274 100644
+index b591ded5f7c7726c6bd3923f3b8243b08b3569c4..06ce27ddf7bfabd8f803fe9c1a82f7dba9818178 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -693,8 +693,13 @@ public final class ItemStack implements DataComponentHolder {
@@ -27,7 +27,7 @@ index bcb3a45166e5dd75dd727adf92304b3a75399c8d..90a55f00c36903d52630c51bf6932297
 -        int j = this.processDurabilityChange(amount, world, player);
 +        int j = this.processDurabilityChange(amount, world, player, force); // Paper
          // CraftBukkit start
-         if (player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
+         if (j > 0 && player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent - limit to positive damage and run for player
              PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j, originalDamage); // Paper - Add EntityDamageItemEvent
 @@ -726,7 +731,12 @@ public final class ItemStack implements DataComponentHolder {
      }

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

@@ -12,7 +12,7 @@ public net/minecraft/world/level/block/entity/BlockEntity saveId(Lnet/minecraft/
 Co-authored-by: GhastCraftHD <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 98b5208baeaa12a5ff2788e457c542000d6ea48b..babd89f39c43b0c64709d99bf8aca6cdc6ca1b24 100644
+index 49ab79b6a22362d5fa226ea502ef2a6d3bb40e21..5a3a88091dd8775e4ef0417ab2e2d376931c870a 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -1361,6 +1361,11 @@ public final class ItemStack implements DataComponentHolder {

patches/server/0982-Optimize-Hoppers.patch

@@ -64,7 +64,7 @@ index b13b3991292ab96542ba390f3e8e3ff0d7529c44..ff6f2dc31bbbaa420323a68282cb1ee3
              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 947e2a3620d73569552c5185664b7564e908007e..33e7d2884195677c4d6340d8b84c1dd85c636ec1 100644
+index d7c88b4edbf9158a2e7a520e80526fe967e93aff..3ae07439de25ee30ae32d214bb630180e3451e57 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -881,10 +881,16 @@ public final class ItemStack implements DataComponentHolder {