From 71cd505d451323423a9de82f280d04b48497c820 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 15 Jun 2016 13:31:35 +1000 Subject: [PATCH] SPIGOT-2405: Better event for combust due to fire --- nms-patches/Entity.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nms-patches/Entity.patch b/nms-patches/Entity.patch index e6e2c8142..a88c50608 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()) {