mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 12:27:59 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
28 lines
1.6 KiB
Diff
28 lines
1.6 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 damage modifier inconsistencies
|
|
|
|
Affect the falling stalactite damage type where the
|
|
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 41a0650bfd6e72b83364441dd76df3d561d3163e..deba03eb37012c638e08e20cd1c98e9db190c790 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -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);
|
|
}
|
|
- 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);
|
|
}
|