Skip to content

Commit bb76819

Browse files
authored
Pass correct damage to EntityDamageItemEvent (PaperMC#11744)
1 parent b746d9d commit bb76819

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

patches/server/0566-Add-EntityDamageItemEvent.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityDamageItemEvent
55

66

77
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
8-
index 225206a055e2f6bf4dbb18434cb3401d02746387..e320264c2283c2c09910ea70606413c73f443b1f 100644
8+
index 225206a055e2f6bf4dbb18434cb3401d02746387..45bed9ff8f16d16317b2300f4854017d1d1dec70 100644
99
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
1010
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
1111
@@ -697,11 +697,11 @@ public final class ItemStack implements DataComponentHolder {
@@ -29,7 +29,7 @@ index 225206a055e2f6bf4dbb18434cb3401d02746387..e320264c2283c2c09910ea70606413c7
2929
j = event.getDamage();
3030
+ // Paper start - Add EntityDamageItemEvent
3131
+ } else if (player != null) {
32-
+ io.papermc.paper.event.entity.EntityDamageItemEvent event = new io.papermc.paper.event.entity.EntityDamageItemEvent(player.getBukkitLivingEntity(), CraftItemStack.asCraftMirror(this), amount);
32+
+ io.papermc.paper.event.entity.EntityDamageItemEvent event = new io.papermc.paper.event.entity.EntityDamageItemEvent(player.getBukkitLivingEntity(), CraftItemStack.asCraftMirror(this), j);
3333
+ if (!event.callEvent()) {
3434
+ return;
3535
+ }

0 commit comments

Comments
 (0)