--- a/net/minecraft/world/CompoundContainer.java +++ b/net/minecraft/world/CompoundContainer.java @@ -3,11 +3,62 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +// CraftBukkit start +import java.util.ArrayList; +import java.util.List; +import org.bukkit.Location; + +import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; +// CraftBukkit end + public class CompoundContainer implements Container { public final Container container1; public final Container container2; + // CraftBukkit start - add fields and methods + public List transaction = new java.util.ArrayList(); + + public List getContents() { + List result = new ArrayList(this.getContainerSize()); + for (int i = 0; i < this.getContainerSize(); i++) { + result.add(this.getItem(i)); + } + return result; + } + + public void onOpen(CraftHumanEntity who) { + this.container1.onOpen(who); + this.container2.onOpen(who); + this.transaction.add(who); + } + + public void onClose(CraftHumanEntity who) { + this.container1.onClose(who); + this.container2.onClose(who); + this.transaction.remove(who); + } + + public List getViewers() { + return this.transaction; + } + + public org.bukkit.inventory.InventoryHolder getOwner() { + return null; // This method won't be called since CraftInventoryDoubleChest doesn't defer to here + } + + public void setMaxStackSize(int size) { + this.container1.setMaxStackSize(size); + this.container2.setMaxStackSize(size); + } + + @Override + public Location getLocation() { + return this.container1.getLocation(); // TODO: right? + } + // CraftBukkit end + public CompoundContainer(Container first, Container second) { this.container1 = first; this.container2 = second; @@ -54,7 +105,7 @@ @Override public int getMaxStackSize() { - return this.container1.getMaxStackSize(); + return Math.min(this.container1.getMaxStackSize(), this.container2.getMaxStackSize()); // CraftBukkit - check both sides } @Override