Skip to content

Commit edabff8

Browse files
authored
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.
1 parent eef40b7 commit edabff8

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

patches/server/0948-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,16 @@ index d08eec460a67fbd0b2ed2e0dd6d557dc629f4dfe..555d1b05ef6278567de598488b9486db
4848
}
4949

5050
public CombatTracker getCombatTracker() {
51+
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
52+
index fc19bd326f00d1e8bd08ef6cc430c555337a6e3d..fb84ee1225cd762ef306d1fc3e1baed42c034a3c 100644
53+
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
54+
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
55+
@@ -388,7 +388,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
56+
}
57+
58+
}
59+
- return false; // CraftBukkit
60+
+ return true; // CraftBukkit // Paper - return false ONLY if event was cancelled
61+
}
62+
63+
private boolean canArmorAbsorb(DamageSource source) {

0 commit comments

Comments
 (0)