diff options
author | Erik Broes <erikbroes@grum.nl> | 2012-02-29 22:31:04 +0100 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 01:12:41 +0000 |
commit | 33ba9f0a2f56bdba89574d25b44905af95480dbe (patch) | |
tree | dd446975bfd0406c3deac50c0bc1e156ca737698 /src/main/java/net/minecraft/server/ContainerChest.java | |
parent | 8524ff8ef7be2d386e98f65fdca14c0157e8309f (diff) | |
download | craftbukkit-33ba9f0a2f56bdba89574d25b44905af95480dbe.tar craftbukkit-33ba9f0a2f56bdba89574d25b44905af95480dbe.tar.gz craftbukkit-33ba9f0a2f56bdba89574d25b44905af95480dbe.tar.lz craftbukkit-33ba9f0a2f56bdba89574d25b44905af95480dbe.tar.xz craftbukkit-33ba9f0a2f56bdba89574d25b44905af95480dbe.zip |
Updated to rename revision 02
Diffstat (limited to 'src/main/java/net/minecraft/server/ContainerChest.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ContainerChest.java | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/src/main/java/net/minecraft/server/ContainerChest.java b/src/main/java/net/minecraft/server/ContainerChest.java index c1aa3f5f..e2876d21 100644 --- a/src/main/java/net/minecraft/server/ContainerChest.java +++ b/src/main/java/net/minecraft/server/ContainerChest.java @@ -9,15 +9,31 @@ import org.bukkit.craftbukkit.inventory.CraftInventoryView; public class ContainerChest extends Container { - public IInventory a; // CraftBukkit - private->public + public IInventory container; // CraftBukkit - private->public private int b; // CraftBukkit start private CraftInventoryView bukkitEntity = null; private PlayerInventory player; + + public CraftInventoryView getBukkitView() { + if (bukkitEntity != null) { + return bukkitEntity; + } + CraftInventory inventory; + if (this.container instanceof PlayerInventory) { + inventory = new CraftInventoryPlayer((PlayerInventory) this.container); + } else if (this.container instanceof InventoryLargeChest) { + inventory = new CraftInventoryDoubleChest((InventoryLargeChest) this.container); + } else { + inventory = new CraftInventory(this.container); + } + bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this); + return bukkitEntity; + } // CraftBukkit end public ContainerChest(IInventory iinventory, IInventory iinventory1) { - this.a = iinventory1; + this.container = iinventory1; this.b = iinventory1.getSize() / 9; iinventory1.f(); int i = (this.b - 4) * 18; @@ -48,7 +64,7 @@ public class ContainerChest extends Container { public boolean b(EntityHuman entityhuman) { if (!this.checkReachable) return true; // CraftBukkit - return this.a.a(entityhuman); + return this.container.a(entityhuman); } public ItemStack a(int i) { @@ -68,7 +84,7 @@ public class ContainerChest extends Container { } if (itemstack1.count == 0) { - slot.c((ItemStack) null); + slot.set((ItemStack) null); } else { slot.d(); } @@ -77,26 +93,8 @@ 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(); + this.container.g(); } } |