Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement DamageCause#CAMPFIRE and minor improvement in exception for Unhandled block damage

Browse Source
This commit is contained in:
Doc 2024-06-13 12:23:28 -04:00
parent a4c2ee70db
commit 0a0229bb56
No known key found for this signature in database
GPG Key ID: 569482E14CAEBE86
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -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);
}