diff options
author | Celtic Minstrel <celtic.minstrel.ca@some.place> | 2012-02-29 13:56:35 -0500 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-02-29 15:19:07 -0500 |
commit | 0842bab48b1c24f113c61606a294f5bcdf2e1315 (patch) | |
tree | e10864f22a8c54129d4e670ec15b8da594c333eb /src/main/java/net/minecraft/server/InventoryLargeChest.java | |
parent | 10e593649c224db2f0a4227bdf6eef44bfa16865 (diff) | |
download | craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar.gz craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar.lz craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar.xz craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.zip |
[Bleeding] Implementation of inventory framework. Addresses BUKKIT-856
See the corresponding Bukkit commit for details.
Implementation details:
- Any packets that include an itemstack will send air stacks as null; maybe this will even eliminate the client crash that occurs if the client receives an air stack
- Better handling of null itemstacks in general (ie less converting them to air stacks)
- Inventory.setContents() can now take an array smaller than the inventory without error
- Player.updateInventory() should now correctly update the result slot in a crafting inventory
Some small credit goes to Afforess (initial implementation of openInventory() methods) and Drakia (initial implementation of InventoryOpenEvent and InventoryCloseEvent).
Diffstat (limited to 'src/main/java/net/minecraft/server/InventoryLargeChest.java')
-rw-r--r-- | src/main/java/net/minecraft/server/InventoryLargeChest.java | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/InventoryLargeChest.java b/src/main/java/net/minecraft/server/InventoryLargeChest.java index 5090563f..88cfdcce 100644 --- a/src/main/java/net/minecraft/server/InventoryLargeChest.java +++ b/src/main/java/net/minecraft/server/InventoryLargeChest.java @@ -1,12 +1,23 @@ package net.minecraft.server; +// CraftBukkit start +import java.util.ArrayList; +import java.util.List; + +import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; +import org.bukkit.inventory.InventoryHolder; +// CraftBukkit end + public class InventoryLargeChest implements IInventory { private String a; - private IInventory b; - private IInventory c; + public IInventory b; // CraftBukkit - private -> public + public IInventory c; // CraftBukkit - private -> public // CraftBukkit start + public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); + public ItemStack[] getContents() { ItemStack[] result = new ItemStack[this.getSize()]; for (int i = 0; i < result.length; i++) { @@ -14,6 +25,26 @@ public class InventoryLargeChest implements IInventory { } return result; } + + public void onOpen(CraftHumanEntity who) { + b.onOpen(who); + c.onOpen(who); + transaction.add(who); + } + + public void onClose(CraftHumanEntity who) { + b.onClose(who); + c.onClose(who); + transaction.remove(who); + } + + public List<HumanEntity> getViewers() { + return transaction; + } + + public InventoryHolder getOwner() { + return null; // Double chests technically have multiple owners, so there's no sensible way to pick one + } // CraftBukkit end public InventoryLargeChest(String s, IInventory iinventory, IInventory iinventory1) { |