Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,6 +1,6 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/InventorySubcontainer.java 2014-11-28 17:43:43.213707432 +0000
+++ src/main/java/net/minecraft/server/InventorySubcontainer.java 2014-11-28 17:38:23.000000000 +0000
@@ -3,6 +3,12 @@
--- /home/matt/mc-dev-private//net/minecraft/server/InventorySubcontainer.java 2015-02-26 22:40:22.787608137 +0000
+++ src/main/java/net/minecraft/server/InventorySubcontainer.java 2015-02-26 22:40:22.787608137 +0000
@@ -3,15 +3,56 @@
import com.google.common.collect.Lists;
import java.util.List;
@@ -13,11 +13,12 @@
public class InventorySubcontainer implements IInventory {
private String a;
@@ -10,8 +16,43 @@
public ItemStack[] items;
private List d;
private int b;
- private ItemStack[] items;
+ public ItemStack[] items; // CraftBukkit - public
private List<IInventoryListener> d;
private boolean e;
+
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
@@ -30,7 +31,7 @@
+ public void onOpen(CraftHumanEntity who) {
+ transaction.add(who);
+ }
+
+ public void onClose(CraftHumanEntity who) {
+ transaction.remove(who);
+ }
@@ -46,12 +47,12 @@
+ public org.bukkit.inventory.InventoryHolder getOwner() {
+ return bukkitOwner;
+ }
+
+
public InventorySubcontainer(String s, boolean flag, int i) {
+ this(s, flag, i, null);
+ }
+
+ public InventorySubcontainer(String s, boolean flag, int i, org.bukkit.inventory.InventoryHolder owner) { // Added argument
+ public InventorySubcontainer(String s, boolean flag, int i, org.bukkit.inventory.InventoryHolder owner) { // Added argument
+ this.bukkitOwner = owner;
+ // CraftBukkit end
this.a = s;