twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.10

Browse Source
This commit is contained in:
md_5
2016-06-09 11:43:49 +10:00
parent 0cd0397a82
commit a8a4bedd2a
161 changed files with 1176 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nms-patches/TileEntityFurnace.patch
View File

@@ -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]);