diff options
author | Lulu13022002 <[email protected]> | 2024-10-30 14:55:46 +0100 |
---|---|---|
committer | Lulu13022002 <[email protected]> | 2024-10-30 14:55:46 +0100 |
commit | 8ba30733439c3cce627b779d1a902f054927d25a (patch) | |
tree | 390e40a9831dedfc7e50d7ab6784683aa337ea22 | |
parent | 1a1d0cf01ad0a245e8e80e6085075ce5e89181fe (diff) | |
download | Paper-8ba30733439c3cce627b779d1a902f054927d25a.tar.gz Paper-8ba30733439c3cce627b779d1a902f054927d25a.zip |
fix "is_freezing" damage type tag
-rw-r--r-- | patches/server/0948-Fix-damage-modifier-inconsistencies.patch (renamed from patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch) | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0948-Fix-damage-modifier-inconsistencies.patch index 262b84900d..1494c35c06 100644 --- a/patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch +++ b/patches/server/0948-Fix-damage-modifier-inconsistencies.patch @@ -1,16 +1,22 @@ 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 +Subject: [PATCH] Fix damage modifier inconsistencies 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 -index 418e67ef5896325fe143501f5a4f1604b065ba0f..1e98f68e51618606f1178c12be77c1a945362630 100644 +index 418e67ef5896325fe143501f5a4f1604b065ba0f..864e4c660bf3d381880e5928b6945bea213ac57e 100644 --- a/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); modifierFunctions.put(DamageModifier.FREEZING, freezing); } |