Update to Minecraft 1.13-pre7

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions

View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/server/TileEntityBrewingStand.java
+++ b/net/minecraft/server/TileEntityBrewingStand.java
@@ -3,6 +3,16 @@
import java.util.Arrays;
@@ -4,6 +4,16 @@
import java.util.Iterator;
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.List;
@@ -14,12 +14,12 @@
+import org.bukkit.inventory.InventoryHolder;
+// CraftBukkit end
+
public class TileEntityBrewingStand extends TileEntityContainer implements ITickable, IWorldInventory {
public class TileEntityBrewingStand extends TileEntityContainer implements IWorldInventory, ITickable {
private static final int[] a = new int[] { 3};
@@ -14,6 +24,31 @@
private Item k;
private String l;
@@ -15,6 +25,31 @@
private Item j;
private IChatBaseComponent k;
private int fuelLevel;
+ // CraftBukkit start - add fields and methods
+ private int lastTick = MinecraftServer.currentTick;
@@ -48,8 +48,8 @@
+ // CraftBukkit end
public TileEntityBrewingStand() {
this.items = NonNullList.a(5, ItemStack.a);
@@ -55,8 +90,19 @@
super(TileEntityTypes.l);
@@ -62,8 +97,19 @@
ItemStack itemstack = (ItemStack) this.items.get(4);
if (this.fuelLevel <= 0 && itemstack.getItem() == Items.BLAZE_POWDER) {
@@ -71,7 +71,7 @@
this.update();
}
@@ -64,9 +110,14 @@
@@ -71,9 +117,14 @@
boolean flag1 = this.brewTime > 0;
ItemStack itemstack1 = (ItemStack) this.items.get(3);
@@ -87,10 +87,10 @@
+ // CraftBukkit end
if (flag2 && flag) {
this.p();
@@ -140,6 +191,16 @@
this.r();
@@ -147,6 +198,16 @@
private void p() {
private void r() {
ItemStack itemstack = (ItemStack) this.items.get(3);
+ // CraftBukkit start
+ InventoryHolder owner = this.getOwner();
@@ -105,7 +105,7 @@
for (int i = 0; i < 3; ++i) {
this.items.set(i, PotionBrewer.d(itemstack, (ItemStack) this.items.get(i)));
@@ -210,7 +271,7 @@
@@ -213,7 +274,7 @@
}
public int getMaxStackSize() {