diff options
Diffstat (limited to 'patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch')
| -rw-r--r-- | patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch new file mode 100644 index 0000000000..3197bd1c72 --- /dev/null +++ b/patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Doc <[email protected]> +Date: Mon, 1 May 2023 13:34:57 -0400 +Subject: [PATCH] Fix DamageCause for Falling Blocks + + +diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +index 576e982ac53fe6cdc6ca921ad46c36e895509f84..0ed5035044a3fc3ad725ce702720a0742a19ed44 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -1030,6 +1030,11 @@ public class CraftEventFactory { + } else if (source.is(DamageTypes.SONIC_BOOM)) { + cause = DamageCause.SONIC_BOOM; + } ++ // Paper start - fix handle of Falling Blocks ++ else if (source.is(DamageTypes.FALLING_STALACTITE) || source.is(DamageTypes.FALLING_BLOCK) || source.is(DamageTypes.FALLING_ANVIL)) { ++ cause = DamageCause.FALLING_BLOCK; ++ } ++ // Paper end + + return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API + } else if (source.is(DamageTypes.FELL_OUT_OF_WORLD)) { |