diff options
author | Nassim Jahnke <[email protected]> | 2023-09-23 11:45:34 +1000 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2023-09-23 11:45:34 +1000 |
commit | a353f4d207994e0f2dfe55047cffbcb98f74bafc (patch) | |
tree | d16ee406ab9cd0d19c35f1c318d59e28c23cf6d6 /patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch | |
parent | a50d7c340b9922eab16fd9f246269b4c75453648 (diff) | |
download | Paper-a353f4d207994e0f2dfe55047cffbcb98f74bafc.tar.gz Paper-a353f4d207994e0f2dfe55047cffbcb98f74bafc.zip |
Readd network optimization patch
Diffstat (limited to 'patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch')
-rw-r--r-- | patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch deleted file mode 100644 index 0460fff494..0000000000 --- a/patches/server/0938-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 bdcb1752d0959bbabc17d411f36680bad6669651..9f012b6ccedc2f325f1cb7ee2d4cb843db4e6a41 100644 ---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1060,6 +1060,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)) { |