mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
23 lines
1.3 KiB
Diff
23 lines
1.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Doc <nachito94@msn.com>
|
||
|
|
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 819c9c020f4d5a1373f68850134960d24b8fc308..dee0168b50c7fbaefb762939a04e8f51e7bc58f7 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
@@ -1028,6 +1028,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.OUT_OF_WORLD)) {
|