summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityMinecartContainer.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-11-17 12:41:03 +1100
committermd_5 <git@md-5.net>2016-11-17 12:41:03 +1100
commitc25ddf063a808e3adb749e22017661f403c5fb7e (patch)
treeb2efcff512be12fd3e38cf8c36386148ce6ab4ae /nms-patches/EntityMinecartContainer.patch
parent51263e97187a84338f89698eef187284055a682a (diff)
downloadcraftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar
craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.gz
craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.lz
craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.xz
craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.zip
Update to Minecraft 1.11
Diffstat (limited to 'nms-patches/EntityMinecartContainer.patch')
-rw-r--r--nms-patches/EntityMinecartContainer.patch14
1 files changed, 6 insertions, 8 deletions
diff --git a/nms-patches/EntityMinecartContainer.patch b/nms-patches/EntityMinecartContainer.patch
index 452fa392..15037a60 100644
--- a/nms-patches/EntityMinecartContainer.patch
+++ b/nms-patches/EntityMinecartContainer.patch
@@ -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() {