Update to Minecraft 1.13

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-22 12:00:00 +10:00
parent d9cf61f1a8
commit 1e014acb80
73 changed files with 469 additions and 418 deletions

View File

@@ -16,7 +16,7 @@
public class TileEntityFurnace extends TileEntityContainer implements IWorldInventory, RecipeHolder, AutoRecipeOutput, ITickable {
@@ -98,6 +107,32 @@
@@ -93,6 +102,32 @@
return linkedhashmap;
}
@@ -49,10 +49,10 @@
public TileEntityFurnace() {
super(TileEntityTypes.b);
this.items = NonNullList.a(3, ItemStack.a);
@@ -225,11 +260,30 @@
@@ -220,11 +255,30 @@
}
public void X_() {
public void Y_() {
- boolean flag = this.isBurning();
+ boolean flag = this.getBlock().get(BlockFurnace.LIT); // CraftBukkit - SPIGOT-844 - Check if furnace block is lit using the block instead of burn time
boolean flag1 = false;
@@ -82,7 +82,7 @@
}
if (!this.world.isClientSide) {
@@ -240,12 +294,21 @@
@@ -235,12 +289,21 @@
this.cookTime = MathHelper.clamp(this.cookTime - 2, 0, this.cookTimeTotal);
}
} else {
@@ -109,7 +109,7 @@
flag1 = true;
if (!itemstack.isEmpty()) {
Item item = itemstack.getItem();
@@ -260,6 +323,7 @@
@@ -255,6 +318,7 @@
}
}
@@ -117,7 +117,7 @@
if (this.isBurning() && this.canBurn(irecipe)) {
++this.cookTime;
if (this.cookTime == this.cookTimeTotal) {
@@ -271,11 +335,13 @@
@@ -266,11 +330,13 @@
} else {
this.cookTime = 0;
}
@@ -131,7 +131,7 @@
}
}
@@ -300,7 +366,8 @@
@@ -295,7 +361,8 @@
} else {
ItemStack itemstack1 = (ItemStack) this.items.get(2);
@@ -141,7 +141,7 @@
}
} else {
return false;
@@ -313,11 +380,38 @@
@@ -308,11 +375,38 @@
ItemStack itemstack1 = irecipe.d();
ItemStack itemstack2 = (ItemStack) this.items.get(2);