diff options
author | md_5 <git@md-5.net> | 2016-06-15 13:31:35 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-06-15 13:31:35 +1000 |
commit | 71cd505d451323423a9de82f280d04b48497c820 (patch) | |
tree | 8ebb72d1c051a1d9eff4f97a5dba280d86cd1254 | |
parent | fb568fdc70321e6325a057868bf65d1ebcba1596 (diff) | |
download | craftbukkit-71cd505d451323423a9de82f280d04b48497c820.tar craftbukkit-71cd505d451323423a9de82f280d04b48497c820.tar.gz craftbukkit-71cd505d451323423a9de82f280d04b48497c820.tar.lz craftbukkit-71cd505d451323423a9de82f280d04b48497c820.tar.xz craftbukkit-71cd505d451323423a9de82f280d04b48497c820.zip |
SPIGOT-2405: Better event for combust due to fire
-rw-r--r-- | nms-patches/Entity.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nms-patches/Entity.patch b/nms-patches/Entity.patch index e6e2c814..a88c5060 100644 --- a/nms-patches/Entity.patch +++ b/nms-patches/Entity.patch @@ -204,7 +204,7 @@ - if (this.fireTicks == 0) { + // CraftBukkit start - Not on fire yet + if (this.fireTicks <= 0) { // Only throw events on the first combust, otherwise it spams -+ EntityCombustEvent event = new EntityCombustEvent(getBukkitEntity(), 8); ++ EntityCombustEvent event = new org.bukkit.event.entity.EntityCombustByBlockEvent(null, getBukkitEntity(), 8); + world.getServer().getPluginManager().callEvent(event); + + if (!event.isCancelled()) { |