aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch')
-rw-r--r--patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch
index 63023e73f0..a161fd71b6 100644
--- a/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch
+++ b/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable damage tick when blocking with shield
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ce686e5a98aea61979b842637ed6ebb97e64d2e1..cebb05310502cd1e2277896e75fddab268a3fdf1 100644
+index 6feab3d1b85857ab2c5b2228f2b0d5e6c2a5518d..ff7616e1d6d6c821a75649812ec69e0dc6a8e378 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2486,7 +2486,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2487,7 +2487,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
CriteriaTriggers.PLAYER_HURT_ENTITY.trigger((ServerPlayer) damagesource.getEntity(), this, damagesource, originalDamage, f, true); // Paper - fix taken/dealt param order
}