summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemInWorldManager.java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-11-06 06:05:28 -0600
committerTravis Watkins <amaranth@ubuntu.com>2012-11-13 16:09:52 -0600
commit7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7 (patch)
tree843902ff94d82e86f40d7e0af1ac838fee859e75 /src/main/java/net/minecraft/server/ItemInWorldManager.java
parenta0c3b4f9d1b403fa64230f22b5dd3222181ba646 (diff)
downloadcraftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar
craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.gz
craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.lz
craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.xz
craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.zip
Update CraftBukkit to Minecraft 1.4.4.
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemInWorldManager.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemInWorldManager.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/ItemInWorldManager.java b/src/main/java/net/minecraft/server/ItemInWorldManager.java
index 025c25a7..78ab6f26 100644
--- a/src/main/java/net/minecraft/server/ItemInWorldManager.java
+++ b/src/main/java/net/minecraft/server/ItemInWorldManager.java
@@ -303,13 +303,13 @@ public class ItemInWorldManager {
if (this.isCreative()) {
this.player.netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, this.world));
} else {
- ItemStack itemstack = this.player.bP();
+ ItemStack itemstack = this.player.bT();
boolean flag1 = this.player.b(Block.byId[l]);
if (itemstack != null) {
itemstack.a(this.world, l, i, j, k, this.player);
if (itemstack.count == 0) {
- this.player.bQ();
+ this.player.bU();
}
}
@@ -348,7 +348,7 @@ public class ItemInWorldManager {
entityhuman.inventory.items[entityhuman.inventory.itemInHandIndex] = null;
}
- if (!entityhuman.bI()) {
+ if (!entityhuman.bM()) {
((EntityPlayer) entityhuman).updateInventory(entityhuman.defaultContainer);
}
@@ -356,7 +356,6 @@ public class ItemInWorldManager {
}
}
- // CraftBukkit - TODO: Review this code, it changed in 1.8 but I'm not sure if we need to update or not
public boolean interact(EntityHuman entityhuman, World world, ItemStack itemstack, int i, int j, int k, int l, float f, float f1, float f2) {
int i1 = world.getTypeId(i, j, k);