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/ContainerChest.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/ContainerChest.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ContainerChest.java | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/ContainerChest.java b/src/main/java/net/minecraft/server/ContainerChest.java index 5da010fd..c1aa3f5f 100644 --- a/src/main/java/net/minecraft/server/ContainerChest.java +++ b/src/main/java/net/minecraft/server/ContainerChest.java @@ -1,15 +1,30 @@ package net.minecraft.server; +// CraftBukkit start +import org.bukkit.craftbukkit.inventory.CraftInventory; +import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest; +import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.inventory.CraftInventoryView; +// CraftBukkit end + public class ContainerChest extends Container { - private IInventory a; + public IInventory a; // CraftBukkit - private->public private int b; + // CraftBukkit start + private CraftInventoryView bukkitEntity = null; + private PlayerInventory player; + // CraftBukkit end public ContainerChest(IInventory iinventory, IInventory iinventory1) { this.a = iinventory1; this.b = iinventory1.getSize() / 9; iinventory1.f(); int i = (this.b - 4) * 18; + // CraftBukkit start - save player + // TODO: Should we check to make sure it really is an InventoryPlayer? + this.player = (PlayerInventory)iinventory; + // CraftBukkit end int j; int k; @@ -32,6 +47,7 @@ public class ContainerChest extends Container { } public boolean b(EntityHuman entityhuman) { + if (!this.checkReachable) return true; // CraftBukkit return this.a.a(entityhuman); } @@ -61,6 +77,24 @@ public class ContainerChest extends Container { return itemstack; } + // CraftBukkit start + public CraftInventoryView getBukkitView() { + if (bukkitEntity != null) { + return bukkitEntity; + } + CraftInventory inventory; + if (a instanceof PlayerInventory) { + inventory = new CraftInventoryPlayer((PlayerInventory)a); + } else if (a instanceof InventoryLargeChest) { + inventory = new CraftInventoryDoubleChest((InventoryLargeChest)a); + } else { + inventory = new CraftInventory(this.a); + } + bukkitEntity = new CraftInventoryView(this.player.d.getBukkitEntity(), inventory, this); + return bukkitEntity; + } + // CraftBukkit end + public void a(EntityHuman entityhuman) { super.a(entityhuman); this.a.g(); |