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,11 +1,44 @@
package net.minecraft.server;
import javax.annotation.Nullable;
import java.util.Iterator;
+// CraftBukkit start
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
@@ -12,12 +12,12 @@
public class InventoryCraftResult implements IInventory {
private final ItemStack[] items = new ItemStack[1];
private final NonNullList<ItemStack> items;
+ // CraftBukkit start
+ private int maxStack = MAX_STACK;
+
+ public ItemStack[] getContents() {
+ public java.util.List<ItemStack> getContents() {
+ return this.items;
+ }
+
@@ -42,10 +42,10 @@
+ }
+ // CraftBukkit end
+
public InventoryCraftResult() {}
public int getSize() {
@@ -44,7 +77,7 @@
public InventoryCraftResult() {
this.items = NonNullList.a(1, ItemStack.a);
}
@@ -59,7 +92,7 @@
}
public int getMaxStackSize() {