diff options
| author | Lulu13022002 <[email protected]> | 2024-04-27 21:56:29 +0200 |
|---|---|---|
| committer | Lulu13022002 <[email protected]> | 2024-04-27 21:56:29 +0200 |
| commit | 0b1b1fe067444c5e879313e017da0ffd5d6b826d (patch) | |
| tree | 31170326c033e2bbe71aec5d20ca0809c530a1e4 | |
| parent | 55b1a8740d93768b3e731ace7b91e10c43bcc444 (diff) | |
| download | Paper-0b1b1fe067444c5e879313e017da0ffd5d6b826d.tar.gz Paper-0b1b1fe067444c5e879313e017da0ffd5d6b826d.zip | |
fix helmet damage reduction inconsistencies
See: https://github.com/PaperMC/Paper/issues/9555#issuecomment-1681120506
| -rw-r--r-- | patches/server/1045-Fix-helmet-damage-reduction-inconsistencies.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/server/1045-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/1045-Fix-helmet-damage-reduction-inconsistencies.patch new file mode 100644 index 0000000000..38d5a20724 --- /dev/null +++ b/patches/server/1045-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 544567e576023709f86abf57963c37a5490ab9f0..5a9c68b60cf3bf694fe1fcd3b095516b6481f8a2 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -1215,7 +1215,7 @@ public class CraftEventFactory { + Map<DamageModifier, Function<? super Double, Double>> modifierFunctions = new EnumMap<>(DamageModifier.class); + modifiers.put(DamageModifier.BASE, rawDamage); + modifierFunctions.put(DamageModifier.BASE, CraftEventFactory.ZERO); +- 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); + } |