summaryrefslogtreecommitdiffstats
path: root/nms-patches/TileEntityFurnace.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-05-21 19:02:38 +1000
committermd_5 <git@md-5.net>2015-05-21 19:02:38 +1000
commitf87cd1a53d86d1c9f961c3a4664f98510182a3b7 (patch)
tree5d3a326cefdeb32ace92ae918aad4c40bd0dfa75 /nms-patches/TileEntityFurnace.patch
parent65fba7fb1041d1f722ec8c042964d99639830f23 (diff)
downloadcraftbukkit-f87cd1a53d86d1c9f961c3a4664f98510182a3b7.tar
craftbukkit-f87cd1a53d86d1c9f961c3a4664f98510182a3b7.tar.gz
craftbukkit-f87cd1a53d86d1c9f961c3a4664f98510182a3b7.tar.lz
craftbukkit-f87cd1a53d86d1c9f961c3a4664f98510182a3b7.tar.xz
craftbukkit-f87cd1a53d86d1c9f961c3a4664f98510182a3b7.zip
Invalidate furnace block type after change.
Diffstat (limited to 'nms-patches/TileEntityFurnace.patch')
-rw-r--r--nms-patches/TileEntityFurnace.patch18
1 files changed, 12 insertions, 6 deletions
diff --git a/nms-patches/TileEntityFurnace.patch b/nms-patches/TileEntityFurnace.patch
index 52aab49a..7db81582 100644
--- a/nms-patches/TileEntityFurnace.patch
+++ b/nms-patches/TileEntityFurnace.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-c2c33c10/net/minecraft/server/TileEntityFurnace.java 2015-05-21 17:23:15.279886524 +1000
-+++ src/main/java/net/minecraft/server/TileEntityFurnace.java 2015-05-21 17:23:15.283886599 +1000
+--- ../work/decompile-c2c33c10/net/minecraft/server/TileEntityFurnace.java 2015-05-21 19:02:24.117651149 +1000
++++ src/main/java/net/minecraft/server/TileEntityFurnace.java 2015-05-21 19:02:24.117651149 +1000
@@ -1,17 +1,53 @@
package net.minecraft.server;
@@ -70,7 +70,7 @@
public void c() {
- boolean flag = this.isBurning();
-+ boolean flag = (this.w() == Blocks.LIT_FURNACE); // CraftBukkit - SPIGOT-844 - Check if furnace block is lit using the block instead of burn time
++ boolean flag = (this.w() == Blocks.LIT_FURNACE); // CraftBukkit - SPIGOT-844 - Check if furnace block is lit using the block instead of burn time // PAIL: Rename
boolean flag1 = false;
+ // CraftBukkit start - Use wall time instead of ticks for cooking
@@ -130,7 +130,7 @@
if (this.isBurning() && this.canBurn()) {
++this.cookTime;
if (this.cookTime == this.cookTimeTotal) {
-@@ -179,6 +246,7 @@
+@@ -179,11 +246,13 @@
} else {
this.cookTime = 0;
}
@@ -138,7 +138,13 @@
}
if (flag != this.isBurning()) {
-@@ -203,7 +271,8 @@
+ flag1 = true;
+ BlockFurnace.a(this.isBurning(), this.world, this.position);
++ this.E(); // CraftBukkit - Invalidate tile entity's cached block type // PAIL: Rename
+ }
+ }
+
+@@ -203,7 +272,8 @@
} else {
ItemStack itemstack = RecipesFurnace.getInstance().getResult(this.items[0]);
@@ -148,7 +154,7 @@
}
}
-@@ -211,11 +280,38 @@
+@@ -211,11 +281,38 @@
if (this.canBurn()) {
ItemStack itemstack = RecipesFurnace.getInstance().getResult(this.items[0]);