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

@@ -1,8 +1,8 @@
--- a/net/minecraft/server/InventorySubcontainer.java
+++ b/net/minecraft/server/InventorySubcontainer.java
@@ -5,6 +5,13 @@
@@ -4,13 +4,65 @@
import java.util.Iterator;
import java.util.List;
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.List;
@@ -13,10 +13,9 @@
+
public class InventorySubcontainer implements IInventory, AutoRecipeOutput {
private final IChatBaseComponent a;
@@ -13,7 +20,47 @@
private List<IInventoryListener> d;
private IChatBaseComponent e;
private final int a;
public final NonNullList<ItemStack> items;
private List<IInventoryListener> c;
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
@@ -39,6 +38,11 @@
+ return transaction;
+ }
+
+ @Override
+ public int getMaxStackSize() {
+ return maxStack;
+ }
+
+ public void setMaxStackSize(int i) {
+ maxStack = i;
+ }
@@ -52,13 +56,13 @@
+ return null;
+ }
+
public InventorySubcontainer(IChatBaseComponent ichatbasecomponent, int i) {
+ this(ichatbasecomponent, i, null);
public InventorySubcontainer(int i) {
+ this(i, null);
+ }
+
+ public InventorySubcontainer(IChatBaseComponent ichatbasecomponent, int i, org.bukkit.inventory.InventoryHolder owner) {
+ public InventorySubcontainer(int i, org.bukkit.inventory.InventoryHolder owner) {
+ this.bukkitOwner = owner;
+ // CraftBukkit end
this.a = ichatbasecomponent;
this.b = i;
this.a = i;
this.items = NonNullList.a(i, ItemStack.a);
}