Start update, apply API patches

1 files changed, 63 insertions, 0 deletions

diff --git a/patches/unapplied/server/0946-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/unapplied/server/0946-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
new file mode 100644
index 0000000000..1c00cb4a33
--- /dev/null
+++ b/patches/unapplied/server/0946-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
@@ -0,0 +1,63 @@
+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 d08eec460a67fbd0b2ed2e0dd6d557dc629f4dfe..555d1b05ef6278567de598488b9486db965b8587 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -1455,7 +1455,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+                 amount = 0.0F;
+             }
+ 
+-            float f1 = amount;
++            float f1 = amount; final float originalAmount = f1; // Paper - revert to vanilla #hurt - OBFHELPER
+             boolean flag = amount > 0.0F && this.isDamageSourceBlocked(source); // Copied from below
+             float f2 = 0.0F;
+ 
+@@ -1513,6 +1513,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+                 if (!this.actuallyHurt(world, source, (float) event.getFinalDamage() - this.lastHurt, event)) {
+                     return false;
+                 }
++                if (this instanceof ServerPlayer && event.getDamage() == 0 && originalAmount == 0) return false; // Paper - revert to vanilla damage - players are not affected by damage that is 0 - skip damage if the vanilla damage is 0 and was not modified by plugins in the event.
+                 // CraftBukkit end
+                 this.lastHurt = amount;
+                 flag1 = false;
+@@ -1521,6 +1522,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+                 if (!this.actuallyHurt(world, source, (float) event.getFinalDamage(), event)) {
+                     return false;
+                 }
++                if (this instanceof ServerPlayer && event.getDamage() == 0 && originalAmount == 0) return false; // Paper - revert to vanilla damage - players are not affected by damage that is 0 - skip damage if the vanilla damage is 0 and was not modified by plugins in the event.
+                 this.lastHurt = amount;
+                 this.invulnerableTime = this.invulnerableDuration; // CraftBukkit - restore use of maxNoDamageTicks
+                 // this.actuallyHurt(worldserver, damagesource, f);
+@@ -2487,12 +2489,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() {
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+index fc19bd326f00d1e8bd08ef6cc430c555337a6e3d..fb84ee1225cd762ef306d1fc3e1baed42c034a3c 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+@@ -388,7 +388,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+             }
+ 
+         }
+-        return false; // CraftBukkit
++        return true; // CraftBukkit // Paper - return false ONLY if event was cancelled
+     }
+ 
+     private boolean canArmorAbsorb(DamageSource source) {