From 4a2f53c6e8c8ba64979f46ab5922e0dc951b59af Mon Sep 17 00:00:00 2001 From: Jake Potrebic <15055071+Machine-Maker@users.noreply.github.com> Date: Fri, 6 Aug 2021 23:03:50 -0700 Subject: [PATCH] Add missing DamageCause for EntityDamageByBlockEvent (#6352) --- ...l-EntityDamageByBlockEvent-for-campfires.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/patches/server/0740-call-EntityDamageByBlockEvent-for-campfires.patch b/patches/server/0740-call-EntityDamageByBlockEvent-for-campfires.patch index 42943289ce5..a3058923047 100644 --- a/patches/server/0740-call-EntityDamageByBlockEvent-for-campfires.patch +++ b/patches/server/0740-call-EntityDamageByBlockEvent-for-campfires.patch @@ -18,3 +18,18 @@ index 2519a0f511f0a6065459cd2fe2d9a3e68e55d222..2c334ce3fc3cf86704dee9397166119a } super.entityInside(state, world, pos, entity); +diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +index d01d4ca873f8225d3503ecb102ce2eb7bfced421..622a0f23db838b839f76722df0e5480ec927b4a2 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -1009,6 +1009,10 @@ public class CraftEventFactory { + cause = DamageCause.HOT_FLOOR; + } else if (source == DamageSource.MAGIC) { + cause = DamageCause.MAGIC; ++ // Paper start ++ } else if (source == DamageSource.IN_FIRE) { ++ cause = DamageCause.FIRE; ++ // Paper end + } else { + throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.msgId)); + }