aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0871-Fix-DamageCause-for-Falling-Blocks.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0871-Fix-DamageCause-for-Falling-Blocks.patch')
-rw-r--r--patches/server/0871-Fix-DamageCause-for-Falling-Blocks.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/patches/server/0871-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0871-Fix-DamageCause-for-Falling-Blocks.patch
deleted file mode 100644
index 1edf21d719..0000000000
--- a/patches/server/0871-Fix-DamageCause-for-Falling-Blocks.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 0e640dc081228484a4568f2c5fed71610ac1c6c6..734f68cee62a31513bdfefa5c7074ac38b3c1622 100644
---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1111,6 +1111,11 @@ public class CraftEventFactory {
- } else if (source.is(DamageTypes.SONIC_BOOM)) {
- cause = DamageCause.SONIC_BOOM;
- }
-+ // Paper start - fix falling block handling
-+ else if (source.is(DamageTypes.FALLING_STALACTITE) || source.is(DamageTypes.FALLING_BLOCK) || source.is(DamageTypes.FALLING_ANVIL)) {
-+ cause = DamageCause.FALLING_BLOCK;
-+ }
-+ // Paper end - fix falling block handling
-
- 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)) {