Update to Minecraft 1.11

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-11-17 12:41:03 +11:00
parent 49bc1c57f9
commit 4e412ab4e3
279 changed files with 3722 additions and 2992 deletions

View File

@@ -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
+ private final EntityHuman owner;
+
+ public InventoryHolder getBukkitOwner() {
+ return owner.getBukkitEntity();
+ }
+ // 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;
+ }
+
+ public int getMaxStackSize() {
+ return maxStack;
+ }
+ // 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) {