2024-04-27 21:56:29 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
|
|
|
|
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
|
2024-04-30 00:16:07 +02:00
|
|
|
index 92a9643a31d3b753c997854a0db0ceabe883fd29..547ab158cd0cbf51da06ea97740cfce34bca651b 100644
|
2024-04-27 21:56:29 +02:00
|
|
|
--- 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);
|
|
|
|
|
}
|
