aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-10-27 18:11:15 +0100
committerNassim Jahnke <[email protected]>2024-10-27 18:39:30 +0100
commit02bca1e6558bf4ac0cbf928d48e90f497b10b0a3 (patch)
tree1144072e447f4c0b7e80b278fd769106227f016a /patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch
parent12ed02105177f54906a7d4422b235929426bc264 (diff)
downloadPaper-02bca1e6558bf4ac0cbf928d48e90f497b10b0a3.tar.gz
Paper-02bca1e6558bf4ac0cbf928d48e90f497b10b0a3.zip
Remove timings impl
Diffstat (limited to 'patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch')
-rw-r--r--patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch
new file mode 100644
index 0000000000..ef4efc0ef7
--- /dev/null
+++ b/patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lulu13022002 <[email protected]>
+Date: Sat, 27 Apr 2024 21:51:58 +0200
+Subject: [PATCH] Fix helmet damage reduction inconsistencies
+
+Affect the falling stalactite damage type where the
+reduction is not applied like in Vanilla
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index 96b901d07718d8926a2175925e867b4417c3947c..6c60bb4f4d1133844a4232df518c062216847fdc 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1226,7 +1226,7 @@ public class CraftEventFactory {
+ modifiers.put(DamageModifier.FREEZING, freezingModifier);
+ modifierFunctions.put(DamageModifier.FREEZING, freezing);
+ }
+- if (source.is(DamageTypes.FALLING_BLOCK) || source.is(DamageTypes.FALLING_ANVIL)) {
++ if (source.is(DamageTypeTags.DAMAGES_HELMET)) { // Paper
+ modifiers.put(DamageModifier.HARD_HAT, hardHatModifier);
+ modifierFunctions.put(DamageModifier.HARD_HAT, hardHat);
+ }