diff options
| author | md_5 <git@md-5.net> | 2016-06-09 11:43:49 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-06-09 11:43:49 +1000 |
| commit | a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d (patch) | |
| tree | 9efb0ce242b802a188032bd500ef7afaf29032a3 /nms-patches/TileEntityFurnace.patch | |
| parent | 0cd0397a8295992112ad3bf0d37795a04d22503e (diff) | |
| download | craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.gz craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.lz craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.xz craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.zip | |
Update to Minecraft 1.10
Diffstat (limited to 'nms-patches/TileEntityFurnace.patch')
| -rw-r--r-- | nms-patches/TileEntityFurnace.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nms-patches/TileEntityFurnace.patch b/nms-patches/TileEntityFurnace.patch index 7b265b96..2c0539b7 100644 --- a/nms-patches/TileEntityFurnace.patch +++ b/nms-patches/TileEntityFurnace.patch @@ -49,10 +49,10 @@ public TileEntityFurnace() {} public int getSize() { -@@ -122,11 +157,29 @@ +@@ -126,11 +161,29 @@ } - public void c() { + public void E_() { - boolean flag = this.isBurning(); + boolean flag = (this.getBlock() == Blocks.LIT_FURNACE); // CraftBukkit - SPIGOT-844 - Check if furnace block is lit using the block instead of burn time boolean flag1 = false; @@ -81,12 +81,13 @@ } if (!this.world.isClientSide) { -@@ -135,9 +188,21 @@ +@@ -139,10 +192,21 @@ this.cookTime = MathHelper.clamp(this.cookTime - 2, 0, this.cookTimeTotal); } } else { - if (!this.isBurning() && this.canBurn()) { -- this.ticksForCurrentFuel = this.burnTime = fuelTime(this.items[1]); +- this.burnTime = fuelTime(this.items[1]); +- this.ticksForCurrentFuel = this.burnTime; - if (this.isBurning()) { + // CraftBukkit start - Handle multiple elapsed ticks + if (this.burnTime <= 0 && this.canBurn()) { // CraftBukkit - == to <= @@ -106,7 +107,7 @@ flag1 = true; if (this.items[1] != null) { --this.items[1].count; -@@ -150,6 +215,7 @@ +@@ -155,6 +219,7 @@ } } @@ -114,7 +115,7 @@ if (this.isBurning() && this.canBurn()) { ++this.cookTime; if (this.cookTime == this.cookTimeTotal) { -@@ -161,11 +227,13 @@ +@@ -166,11 +231,13 @@ } else { this.cookTime = 0; } @@ -128,7 +129,7 @@ } } -@@ -185,7 +253,8 @@ +@@ -190,7 +257,8 @@ } else { ItemStack itemstack = RecipesFurnace.getInstance().getResult(this.items[0]); @@ -138,7 +139,7 @@ } } -@@ -193,11 +262,38 @@ +@@ -198,11 +266,38 @@ if (this.canBurn()) { ItemStack itemstack = RecipesFurnace.getInstance().getResult(this.items[0]); |