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,7 +1,7 @@
--- a/net/minecraft/server/EntityMinecartContainer.java
+++ b/net/minecraft/server/EntityMinecartContainer.java
@@ -2,14 +2,57 @@
@@ -3,6 +3,13 @@
import java.util.Iterator;
import java.util.Random;
import javax.annotation.Nullable;
+// CraftBukkit start
@@ -14,9 +14,7 @@
public abstract class EntityMinecartContainer extends EntityMinecartAbstract implements ITileInventory, ILootable {
- private ItemStack[] items = new ItemStack[36];
+ private ItemStack[] items = new ItemStack[27]; // CraftBukkit - 36 -> 27
private boolean b = true;
@@ -11,6 +18,42 @@
private MinecraftKey c;
private long d;
@@ -24,7 +22,7 @@
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
+
+ public ItemStack[] getContents() {
+ public List<ItemStack> getContents() {
+ return this.items;
+ }
+
@@ -58,8 +56,8 @@
+
public EntityMinecartContainer(World world) {
super(world);
}
@@ -75,7 +118,7 @@
this.items = NonNullList.a(36, ItemStack.a);
@@ -93,7 +136,7 @@
}
public int getMaxStackSize() {