Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 03:55:14 +01:00
Code Issues Projects Releases Wiki Activity

fix "is_freezing" damage type tag

Browse Source
This commit is contained in:
Lulu13022002 2024-10-30 14:55:46 +01:00
parent 1a1d0cf01a
commit 8ba3073343
No known key found for this signature in database
GPG Key ID: 491C8F0B8ACDEB01
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch → patches/server/0948-Fix-damage-modifier-inconsistencies.patch
View File

@ -1,16 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Sat, 27 Apr 2024 21:51:58 +0200 Date: Sat, 27 Apr 2024 21:51:58 +0200
Subject: [PATCH] Fix helmet damage reduction inconsistencies Subject: [PATCH] Fix damage modifier inconsistencies
Affect the falling stalactite damage type where the Affect the falling stalactite damage type where the
reduction is not applied like in Vanilla reduction is not applied like in Vanilla.
Additionally fix the "is_freezing" damage type tag.
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 418e67ef5896325fe143501f5a4f1604b065ba0f..1e98f68e51618606f1178c12be77c1a945362630 100644 index 418e67ef5896325fe143501f5a4f1604b065ba0f..864e4c660bf3d381880e5928b6945bea213ac57e 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1226,7 +1226,7 @@ public class CraftEventFactory { @@ -1222,11 +1222,11 @@ 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.FREEZE)) {
+ if (source.is(DamageTypeTags.IS_FREEZING)) { // Paper
modifiers.put(DamageModifier.FREEZING, freezingModifier); modifiers.put(DamageModifier.FREEZING, freezingModifier);
modifierFunctions.put(DamageModifier.FREEZING, freezing); modifierFunctions.put(DamageModifier.FREEZING, freezing);
} }