From 0a0229bb56a8dafae9cd720e17a80e3c9d9b89e8 Mon Sep 17 00:00:00 2001 From: Doc Date: Thu, 13 Jun 2024 12:23:28 -0400 Subject: [PATCH] Implement DamageCause#CAMPFIRE and minor improvement in exception for Unhandled block damage --- .../java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index b21f91958..073745afd 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -989,8 +989,10 @@ public class CraftEventFactory { cause = DamageCause.MAGIC; } else if (source.is(DamageTypes.IN_FIRE)) { cause = DamageCause.FIRE; + } else if (source.is(DamageTypes.CAMPFIRE)) { + cause = DamageCause.CAMPFIRE; } else { - throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, source.getDirectBlock(), source.getMsgId())); + throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s [%s]", entity, source.getDirectBlock(), source.getMsgId(), source.typeHolder().getRegisteredName())); } return callEntityDamageEvent(source.getDirectBlock(), source.getDirectBlockState(), entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled); }