diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-04-27 04:40:05 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-04-27 10:42:19 -0500 |
commit | 799779e4b19605dc7d7befd0b530caf640214d14 (patch) | |
tree | c4f636429e8ea3aec489f6f619dc23b733862ae2 /src/main/java/net/minecraft/server/ContainerHopper.java | |
parent | 83c3aa188bbde405f584f7b66e4fe5cab90aff35 (diff) | |
download | craftbukkit-799779e4b19605dc7d7befd0b530caf640214d14.tar craftbukkit-799779e4b19605dc7d7befd0b530caf640214d14.tar.gz craftbukkit-799779e4b19605dc7d7befd0b530caf640214d14.tar.lz craftbukkit-799779e4b19605dc7d7befd0b530caf640214d14.tar.xz craftbukkit-799779e4b19605dc7d7befd0b530caf640214d14.zip |
Update CraftBukkit to Minecraft 1.5.2
Diffstat (limited to 'src/main/java/net/minecraft/server/ContainerHopper.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ContainerHopper.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/ContainerHopper.java b/src/main/java/net/minecraft/server/ContainerHopper.java index 83b95d13..68c3d68a 100644 --- a/src/main/java/net/minecraft/server/ContainerHopper.java +++ b/src/main/java/net/minecraft/server/ContainerHopper.java @@ -7,7 +7,7 @@ import org.bukkit.craftbukkit.inventory.CraftInventoryView; public class ContainerHopper extends Container { - private final IInventory a; + private final IInventory hopper; // CraftBukkit start private CraftInventoryView bukkitEntity = null; @@ -18,14 +18,14 @@ public class ContainerHopper extends Container { return bukkitEntity; } - CraftInventory inventory = new CraftInventory(this.a); // Should be this.hopper + CraftInventory inventory = new CraftInventory(this.hopper); bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this); return bukkitEntity; } // CraftBukkit end public ContainerHopper(PlayerInventory playerinventory, IInventory iinventory) { - this.a = iinventory; + this.hopper = iinventory; this.player = playerinventory; // CraftBukkit - save player iinventory.startOpen(); byte b0 = 51; @@ -49,7 +49,7 @@ public class ContainerHopper extends Container { public boolean a(EntityHuman entityhuman) { if (!this.checkReachable) return true; // CraftBukkit - return this.a.a(entityhuman); + return this.hopper.a(entityhuman); } public ItemStack b(EntityHuman entityhuman, int i) { @@ -60,11 +60,11 @@ public class ContainerHopper extends Container { ItemStack itemstack1 = slot.getItem(); itemstack = itemstack1.cloneItemStack(); - if (i < this.a.getSize()) { - if (!this.a(itemstack1, this.a.getSize(), this.c.size(), true)) { + if (i < this.hopper.getSize()) { + if (!this.a(itemstack1, this.hopper.getSize(), this.c.size(), true)) { return null; } - } else if (!this.a(itemstack1, 0, this.a.getSize(), false)) { + } else if (!this.a(itemstack1, 0, this.hopper.getSize(), false)) { return null; } @@ -80,6 +80,6 @@ public class ContainerHopper extends Container { public void b(EntityHuman entityhuman) { super.b(entityhuman); - this.a.g(); + this.hopper.g(); } } |