From bff551166c2832be8545c9e6567f01fbc1e95f10 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sun, 16 Jun 2024 09:47:53 -0700
Subject: [PATCH] call EntityDamageItemEvent for thorns

---
 patches/server/Add-EntityDamageItemEvent.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/patches/server/Add-EntityDamageItemEvent.patch b/patches/server/Add-EntityDamageItemEvent.patch
index 14b1a703c..ab7a590c4 100644
--- a/patches/server/Add-EntityDamageItemEvent.patch
+++ b/patches/server/Add-EntityDamageItemEvent.patch
@@ -61,3 +61,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  // CraftBukkit start - Check for item breaking
                  if (this.count == 1 && entity instanceof net.minecraft.world.entity.player.Player) {
                      org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((net.minecraft.world.entity.player.Player) entity, this);
+diff --git a/src/main/java/net/minecraft/world/item/enchantment/effects/DamageItem.java b/src/main/java/net/minecraft/world/item/enchantment/effects/DamageItem.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/item/enchantment/effects/DamageItem.java
++++ b/src/main/java/net/minecraft/world/item/enchantment/effects/DamageItem.java
+@@ -0,0 +0,0 @@ public record DamageItem(LevelBasedValue amount) implements EnchantmentEntityEff
+ 
+     @Override
+     public void apply(ServerLevel world, int level, EnchantedItemInUse context, Entity user, Vec3 pos) {
+-        ServerPlayer serverPlayer2 = context.owner() instanceof ServerPlayer serverPlayer ? serverPlayer : null;
+-        context.itemStack().hurtAndBreak((int)this.amount.calculate(level), world, serverPlayer2, context.onBreak());
++        // ServerPlayer serverPlayer2 = context.owner() instanceof ServerPlayer serverPlayer ? serverPlayer : null; // Paper - always pass in entity
++        context.itemStack().hurtAndBreak((int)this.amount.calculate(level), world, context.owner(), context.onBreak()); // Paper - always pass in entity
+     }
+ 
+     @Override