diff --git a/patches/server/Dont-change-Interaction-attack-damage-source.patch b/patches/server/Dont-change-Interaction-attack-damage-source.patch new file mode 100644 index 0000000000..ac18bd5170 --- /dev/null +++ b/patches/server/Dont-change-Interaction-attack-damage-source.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nassim Jahnke +Date: Thu, 16 Mar 2023 10:04:17 +0100 +Subject: [PATCH] Dont change Interaction attack damage source + + +diff --git a/src/main/java/net/minecraft/world/entity/Interaction.java b/src/main/java/net/minecraft/world/entity/Interaction.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/entity/Interaction.java ++++ b/src/main/java/net/minecraft/world/entity/Interaction.java +@@ -0,0 +0,0 @@ public class Interaction extends Entity implements Attackable, Targeting { + if (entityhuman instanceof ServerPlayer) { + ServerPlayer entityplayer = (ServerPlayer) entityhuman; + +- CriteriaTriggers.PLAYER_HURT_ENTITY.trigger(entityplayer, this, source, (float) event.getFinalDamage(), 1.0F, false); // CraftBukkit ++ CriteriaTriggers.PLAYER_HURT_ENTITY.trigger(entityplayer, this, entityhuman.damageSources().generic(), (float) event.getFinalDamage(), 1.0F, false); // CraftBukkit // Paper + } + + return !this.getResponse(); diff --git a/work/Bukkit b/work/Bukkit index 3a54fb167d..2651717c7d 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 3a54fb167d6354b6e39f5027bcde56641f487b8f +Subproject commit 2651717c7d47696a774dfbe3ba1db6c6cfb8a4c5 diff --git a/work/CraftBukkit b/work/CraftBukkit index 55056ad803..dbc32ffa06 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 55056ad80314cca1c910c9b79f31a1b6a4c629f6 +Subproject commit dbc32ffa0667ee6d02771283f19c7ccf8c965563