From 34989c63b0f7f0badc7dafda1df0530ccd85b0d4 Mon Sep 17 00:00:00 2001
From: Bjarne Koll <git@lynxplay.dev>
Date: Sat, 23 Nov 2024 23:05:54 +0100
Subject: [PATCH] Correctly damage tick wolf after armor block (#11653)

Spigot incorrectly returns false in Wolf#actuallyHurt if the armor
absorbed the damage causing the entity to not get damage invuln ticks.
Resolve this by correctly reverting to the "always true" return value as
the event is not cancelled.
---
 ...vanilla-handling-of-LivingEntity-actuallyH.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/patches/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 2b5e8586e3..69c9d1cd14 100644
--- a/patches/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
@@ -48,3 +48,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+@@ -0,0 +0,0 @@ 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) {