aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1042-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/1042-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch')
-rw-r--r--patches/server/1042-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/patches/server/1042-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/1042-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
new file mode 100644
index 0000000000..736542f8cc
--- /dev/null
+++ b/patches/server/1042-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 27 Apr 2024 09:44:53 -0700
+Subject: [PATCH] Revert to vanilla handling of LivingEntity#actuallyHurt
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index 614a90ff73a8a85f4b7fa2c633eb0473ec01c4d2..6e043457a29a890bcefd27fc5bb07c1a7e4e30f7 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -2226,7 +2226,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+ }
+
+ // CraftBukkit start
+- protected boolean actuallyHurt(final DamageSource damagesource, float f) { // void -> boolean, add final
++ protected boolean actuallyHurt(final DamageSource damagesource, float f) { // void -> boolean, add final // Paper - return false ONLY if event cancelled
+ if (!this.isInvulnerableTo(damagesource)) {
+ final boolean human = this instanceof net.minecraft.world.entity.player.Player;
+ float originalDamage = f;
+@@ -2398,12 +2398,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+
+ return true;
+ } else {
+- return originalDamage >= 0;
++ return true; // Paper - return false ONLY if event was cancelled
+ }
+ // CraftBukkit end
+ }
+ }
+- return false; // CraftBukkit
++ return true; // CraftBukkit // Paper - return false ONLY if event was cancelled
+ }
+
+ public CombatTracker getCombatTracker() {