Update to Minecraft 1.9

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-03-01 08:32:46 +11:00
parent 2da480a9c8
commit 21d4bf5d1f
305 changed files with 6684 additions and 6105 deletions

View File

@@ -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) {