diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
index 85fa9a2abf..a3969e0294 100644
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -147,10 +147,10 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
                     return;
                 }
 
-                this.ticksForCurrentFuel = this.fuelTime(this.items[1]);
+                this.ticksForCurrentFuel = furnaceBurnEvent.getBurnTime();
                 this.burnTime += this.ticksForCurrentFuel;
-                // CraftBukkit end
-                if (this.burnTime > 0) {
+                if (this.burnTime > 0 && furnaceBurnEvent.isBurning()) {
+                    // CraftBukkit end
                     flag1 = true;
                     if (this.items[1] != null) {
                         --this.items[1].count;