Pass correct damage to EntityDamageItemEvent (PaperMC#11744)

Mu-L · Dec 15, 2024 · bb76819 · bb76819
1 parent b746d9d
commit bb76819
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/patches/server/0566-Add-EntityDamageItemEvent.patch b/patches/server/0566-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 225206a055e2f6bf4dbb18434cb3401d02746387..e320264c2283c2c09910ea70606413c73f443b1f 100644
+index 225206a055e2f6bf4dbb18434cb3401d02746387..45bed9ff8f16d16317b2300f4854017d1d1dec70 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -697,11 +697,11 @@ public final class ItemStack implements DataComponentHolder {
@@ -29,7 +29,7 @@ index 225206a055e2f6bf4dbb18434cb3401d02746387..e320264c2283c2c09910ea70606413c7
              j = event.getDamage();
 +            // Paper start - Add EntityDamageItemEvent
 +        } else if (player != null) {
-+            io.papermc.paper.event.entity.EntityDamageItemEvent event = new io.papermc.paper.event.entity.EntityDamageItemEvent(player.getBukkitLivingEntity(), CraftItemStack.asCraftMirror(this), amount);
++            io.papermc.paper.event.entity.EntityDamageItemEvent event = new io.papermc.paper.event.entity.EntityDamageItemEvent(player.getBukkitLivingEntity(), CraftItemStack.asCraftMirror(this), j);
 +            if (!event.callEvent()) {
 +                return;
 +            }