1 files changed, 46 insertions, 0 deletions
diff --git a/patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch
new file mode 100644
index 0000000000..60dd2d1db4
--- /dev/null
+++ b/patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 16 Mar 2023 10:04:17 +0100
+Subject: [PATCH] Fix advancement triggers for entity damage
+
+Changes the Interaction entity's trigger to use the vanilla
+generic damage source
+
+Fixes a couple places where the original damage and modified damage
+were passed in the reverse order to the advancement triggers
+
+diff --git a/src/main/java/net/minecraft/world/entity/Interaction.java b/src/main/java/net/minecraft/world/entity/Interaction.java
+index f054d67a637b204de604fadc0d321f5c9816d808..fc5f1e1b445f0a55a35a31d58a90920a80275662 100644
+--- a/src/main/java/net/minecraft/world/entity/Interaction.java
++++ b/src/main/java/net/minecraft/world/entity/Interaction.java
+@@ -160,7 +160,7 @@ 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(), 1.0F, (float) event.getFinalDamage(), false); // CraftBukkit // Paper - use correct source and fix taken/dealt param order
+             }
+ 
+             return !this.getResponse();
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index d9f9a184e22bc02fbfd1ab029abf48af654c9935..cc82b269d422f6cd720021ba009606cab1b90590 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -2322,7 +2322,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+                 // Duplicate triggers if blocking
+                 if (event.getDamage(DamageModifier.BLOCKING) < 0) {
+                     if (this instanceof ServerPlayer) {
+-                        CriteriaTriggers.ENTITY_HURT_PLAYER.trigger((ServerPlayer) this, damagesource, f, originalDamage, true);
++                        CriteriaTriggers.ENTITY_HURT_PLAYER.trigger((ServerPlayer) this, damagesource, originalDamage, f, true); // Paper - fix taken/dealt param order
+                         f2 = (float) -event.getDamage(DamageModifier.BLOCKING);
+                         if (f2 > 0.0F && f2 < 3.4028235E37F) {
+                             ((ServerPlayer) this).awardStat(Stats.DAMAGE_BLOCKED_BY_SHIELD, Math.round(originalDamage * 10.0F));
+@@ -2330,7 +2330,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+                     }
+ 
+                     if (damagesource.getEntity() instanceof ServerPlayer) {
+-                        CriteriaTriggers.PLAYER_HURT_ENTITY.trigger((ServerPlayer) damagesource.getEntity(), this, damagesource, f, originalDamage, true);
++                        CriteriaTriggers.PLAYER_HURT_ENTITY.trigger((ServerPlayer) damagesource.getEntity(), this, damagesource, originalDamage, f, true); // Paper - fix taken/dealt param order
+                     }
+ 
+                     return false;