From 77aea984df9369fc13c36787cb882c706e409af9 Mon Sep 17 00:00:00 2001 From: Jake Potrebic 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/call-EntityDamageByBlockEvent-for-campfires.patch b/patches/server/call-EntityDamageByBlockEvent-for-campfires.patch index f27caa54c2..93940cff1f 100644 --- a/patches/server/call-EntityDamageByBlockEvent-for-campfires.patch +++ b/patches/server/call-EntityDamageByBlockEvent-for-campfires.patch @@ -18,3 +18,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -0,0 +0,0 @@ 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)); + }