diff options
author | mbax <matt@phozop.net> | 2013-07-08 19:43:37 -0400 |
---|---|---|
committer | mbax <matt@phozop.net> | 2013-07-08 19:43:37 -0400 |
commit | f6a0b1e4265544eaee4e4d4adb660812b01d6a06 (patch) | |
tree | 84b161b5b99aa45602889987e03b74ad4a9a8e08 /src/main/java/net/minecraft/server/PlayerInteractManager.java | |
parent | 2d9a9d8cea904deb7f748a0bbdd76a10012b3821 (diff) | |
download | craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar.gz craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar.lz craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar.xz craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.zip |
Update CraftBukkit to 1.6.2
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerInteractManager.java')
-rw-r--r-- | src/main/java/net/minecraft/server/PlayerInteractManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java index d77a4cc1..a7afa55c 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -261,7 +261,7 @@ public class PlayerInteractManager { event.setCancelled(this.gamemode.isAdventure() && !this.player.d(i, j, k)); // Sword + Creative mode pre-cancel - event.setCancelled(event.isCancelled() || (this.gamemode.d() && this.player.aV() != null && this.player.aV().getItem() instanceof ItemSword)); + event.setCancelled(event.isCancelled() || (this.gamemode.d() && this.player.aY() != null && this.player.aY().getItem() instanceof ItemSword)); // Calculate default block experience Block nmsBlock = Block.byId[block.getTypeId()]; @@ -311,13 +311,13 @@ public class PlayerInteractManager { if (this.isCreative()) { this.player.playerConnection.sendPacket(new Packet53BlockChange(i, j, k, this.world)); } else { - ItemStack itemstack = this.player.bt(); + ItemStack itemstack = this.player.bx(); boolean flag1 = this.player.a(Block.byId[l]); if (itemstack != null) { itemstack.a(this.world, l, i, j, k, this.player); if (itemstack.count == 0) { - this.player.bu(); + this.player.by(); } } @@ -356,7 +356,7 @@ public class PlayerInteractManager { entityhuman.inventory.items[entityhuman.inventory.itemInHandIndex] = null; } - if (!entityhuman.bm()) { + if (!entityhuman.bq()) { ((EntityPlayer) entityhuman).updateInventory(entityhuman.defaultContainer); } |