diff options
| author | Jake Potrebic <[email protected]> | 2024-07-16 16:39:57 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-16 16:39:57 -0700 |
| commit | 506f1651e549c290142df8d1e2e8ea831bc381c0 (patch) | |
| tree | 250f8cb16a8e94a588aa9df694e199f3e45ae824 /patches/server/0965-Fix-helmet-damage-reduction-inconsistencies.patch | |
| parent | a6ceda12c54cd8b7d272fe50e744c9b9a26d0838 (diff) | |
| download | Paper-506f1651e549c290142df8d1e2e8ea831bc381c0.tar.gz Paper-506f1651e549c290142df8d1e2e8ea831bc381c0.zip | |
Don't store removed components in multiple places (#11091)
Diffstat (limited to 'patches/server/0965-Fix-helmet-damage-reduction-inconsistencies.patch')
| -rw-r--r-- | patches/server/0965-Fix-helmet-damage-reduction-inconsistencies.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/server/0965-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0965-Fix-helmet-damage-reduction-inconsistencies.patch new file mode 100644 index 0000000000..68b0416c32 --- /dev/null +++ b/patches/server/0965-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 e9a5f06c405fb81609205b6b96cb0a7e49d5589c..9c7cd9387f90d061aec76f7f0451a1da8b42ea3d 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -1219,7 +1219,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); + } |