diff options
author | md_5 <git@md-5.net> | 2016-03-01 08:32:46 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-03-01 09:32:45 +1100 |
commit | aa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch) | |
tree | cb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/EntityMinecartContainer.patch | |
parent | e1ebe524a78e27f6a2829ed4574fded3779094e1 (diff) | |
download | craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.gz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.lz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.xz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.zip |
Update to Minecraft 1.9
Diffstat (limited to 'nms-patches/EntityMinecartContainer.patch')
-rw-r--r-- | nms-patches/EntityMinecartContainer.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nms-patches/EntityMinecartContainer.patch b/nms-patches/EntityMinecartContainer.patch index 2356daee..06b90287 100644 --- a/nms-patches/EntityMinecartContainer.patch +++ b/nms-patches/EntityMinecartContainer.patch @@ -1,21 +1,23 @@ --- a/net/minecraft/server/EntityMinecartContainer.java +++ b/net/minecraft/server/EntityMinecartContainer.java -@@ -1,10 +1,49 @@ +@@ -1,14 +1,51 @@ package net.minecraft.server; + import java.util.Random; +// CraftBukkit start +import java.util.List; -+ +import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; +import org.bukkit.inventory.InventoryHolder; +// CraftBukkit end -+ - public abstract class EntityMinecartContainer extends EntityMinecartAbstract implements ITileInventory { + + 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; + private MinecraftKey c; + private long d; + // CraftBukkit start + public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>(); @@ -51,7 +53,7 @@ public EntityMinecartContainer(World world) { super(world); } -@@ -84,7 +123,7 @@ +@@ -75,7 +112,7 @@ } public int getMaxStackSize() { @@ -59,4 +61,4 @@ + return maxStack; // CraftBukkit } - public void c(int i) { + public Entity c(int i) { |