1 files changed, 13 insertions, 40 deletions
diff --git a/nms-patches/InventoryEnderChest.patch b/nms-patches/InventoryEnderChest.patch
index 26b013ce..2591f07e 100644
--- a/nms-patches/InventoryEnderChest.patch
+++ b/nms-patches/InventoryEnderChest.patch
@@ -1,52 +1,25 @@
 --- a/net/minecraft/server/InventoryEnderChest.java
 +++ b/net/minecraft/server/InventoryEnderChest.java
-@@ -1,9 +1,49 @@
+@@ -1,11 +1,21 @@
  package net.minecraft.server;
  
-+// CraftBukkit start
-+import java.util.List;
-+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
-+import org.bukkit.entity.HumanEntity;
-+// CraftBukkit end
++import org.bukkit.inventory.InventoryHolder;
 +
  public class InventoryEnderChest extends InventorySubcontainer {
  
      private TileEntityEnderChest a;
- 
-+    // CraftBukkit start - add fields and methods
-+    public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
-+    public org.bukkit.entity.Player player;
-+    private int maxStack = MAX_STACK;
-+
-+    public ItemStack[] getContents() {
-+        return this.items;
-+    }
-+
-+    public void onOpen(CraftHumanEntity who) {
-+        transaction.add(who);
-+    }
-+
-+    public void onClose(CraftHumanEntity who) {
-+        transaction.remove(who);
-+    }
-+
-+    public List<HumanEntity> getViewers() {
-+        return transaction;
-+    }
-+
-+    public org.bukkit.inventory.InventoryHolder getOwner() {
-+        return this.player;
-+    }
-+
-+    public void setMaxStackSize(int size) {
-+        maxStack = size;
-+    }
++    // CraftBukkit start
++    private final EntityHuman owner;
 +
-+    public int getMaxStackSize() {
-+        return maxStack;
++    public InventoryHolder getBukkitOwner() {
++        return owner.getBukkitEntity();
 +    }
-+    // CraftBukkit end
-+
-     public InventoryEnderChest() {
+ 
+-    public InventoryEnderChest() {
++    public InventoryEnderChest(EntityHuman owner) {
          super("container.enderchest", false, 27);
++        this.owner = owner;
++        // CraftBukkit end
      }
+ 
+     public void a(TileEntityEnderChest tileentityenderchest) {