Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -16,11 +16,11 @@
+
public class TileEntityBrewingStand extends TileEntityContainer implements IWorldInventory, ITickable {
private static final int[] a = new int[] { 3};
@@ -15,6 +25,31 @@
private Item j;
private IChatBaseComponent k;
private int fuelLevel;
private static final int[] b = new int[] { 3};
@@ -15,6 +25,36 @@
private Item k;
public int fuelLevel;
protected final IContainerProperties a;
+ // CraftBukkit start - add fields and methods
+ private int lastTick = MinecraftServer.currentTick;
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
@@ -42,6 +42,11 @@
+ return this.items;
+ }
+
+ @Override
+ public int getMaxStackSize() {
+ return maxStack;
+ }
+
+ public void setMaxStackSize(int size) {
+ maxStack = size;
+ }
@@ -49,7 +54,7 @@
public TileEntityBrewingStand() {
super(TileEntityTypes.BREWING_STAND);
@@ -62,8 +97,19 @@
@@ -83,8 +123,19 @@
ItemStack itemstack = (ItemStack) this.items.get(4);
if (this.fuelLevel <= 0 && itemstack.getItem() == Items.BLAZE_POWDER) {
@@ -71,7 +76,7 @@
this.update();
}
@@ -71,9 +117,14 @@
@@ -92,9 +143,14 @@
boolean flag1 = this.brewTime > 0;
ItemStack itemstack1 = (ItemStack) this.items.get(3);
@@ -87,10 +92,10 @@
+ // CraftBukkit end
if (flag2 && flag) {
this.r();
@@ -147,6 +198,16 @@
this.s();
@@ -168,6 +224,16 @@
private void r() {
private void s() {
ItemStack itemstack = (ItemStack) this.items.get(3);
+ // CraftBukkit start
+ InventoryHolder owner = this.getOwner();
@@ -105,12 +110,3 @@
for (int i = 0; i < 3; ++i) {
this.items.set(i, PotionBrewer.d(itemstack, (ItemStack) this.items.get(i)));
@@ -213,7 +274,7 @@
}
public int getMaxStackSize() {
- return 64;
+ return this.maxStack; // CraftBukkit
}
public boolean a(EntityHuman entityhuman) {