geforkt von Mirrors/Paper
dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
22 Zeilen
1.3 KiB
Diff
22 Zeilen
1.3 KiB
Diff
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
|
|
index 37bd0b7a1bfb9d59efa803e453f39d4e3fc916a4..bd6fee3e3ad9116802ff8bb57bfa741b881c4057 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);
|
|
}
|