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

@@ -3,7 +3,7 @@
@@ -1,6 +1,14 @@
package net.minecraft.server;
import javax.annotation.Nullable;
import java.util.Iterator;
+// CraftBukkit start
+import java.util.List;
+import org.bukkit.Location;
@@ -26,7 +26,7 @@
+ private EntityHuman owner;
+ private int maxStack = MAX_STACK;
+
+ public ItemStack[] getContents() {
+ public List<ItemStack> getContents() {
+ return this.items;
+ }
+
@@ -35,7 +35,7 @@
+ }
+
+ public InventoryType getInvType() {
+ return items.length == 4 ? InventoryType.CRAFTING : InventoryType.WORKBENCH;
+ return items.size() == 4 ? InventoryType.CRAFTING : InventoryType.WORKBENCH;
+ }
+
+ public void onClose(CraftHumanEntity who) {
@@ -67,5 +67,5 @@
+ // CraftBukkit end
+
public InventoryCrafting(Container container, int i, int j) {
int k = i * j;
this.items = NonNullList.a(i * j, ItemStack.a);
this.d = container;