Update to Minecraft 1.13-pre7

This commit is contained in:
md_5
2018-07-15 10:00:00 +10:00
parent 57ab4cfc6f
commit 421c1728c8
608 changed files with 17788 additions and 9378 deletions

View File

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