mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
47 lines
3.2 KiB
Diff
47 lines
3.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
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 ee9222406bcaef1a1ac09b60a142044c70d31fce..7016ef3f6d56980f36b9f2fb382526363f8ed62b 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Interaction.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Interaction.java
|
||
|
|
@@ -155,7 +155,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 e9d3e34520b706627205e0d5b17b25e09f198e7e..dcfb71b5a53df789e366fea2080921d677549a2e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
@@ -2239,7 +2239,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));
|
||
|
|
@@ -2247,7 +2247,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;
|