-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix helmet damage reduction inconsistencies
See: #9555 (comment)
- Loading branch information
1 parent
55b1a87
commit 0b1b1fe
Showing
1 changed file
with
21 additions
and
0 deletions.
There are no files selected for viewing
21 changes: 21 additions & 0 deletions
21
patches/server/1045-Fix-helmet-damage-reduction-inconsistencies.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
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 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); | ||
} |