From 6c09066e224ac85b8a6464eaf8f53edfeb4beda4 Mon Sep 17 00:00:00 2001 From: Nate Mortensen Date: Mon, 1 Jul 2013 06:03:00 -0500 Subject: Update CraftBukkit to 1.6.1 --- src/main/java/net/minecraft/server/ContainerEnchantTable.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/net/minecraft/server/ContainerEnchantTable.java') diff --git a/src/main/java/net/minecraft/server/ContainerEnchantTable.java b/src/main/java/net/minecraft/server/ContainerEnchantTable.java index 92b654ad..e231b3c6 100644 --- a/src/main/java/net/minecraft/server/ContainerEnchantTable.java +++ b/src/main/java/net/minecraft/server/ContainerEnchantTable.java @@ -125,7 +125,7 @@ public class ContainerEnchantTable extends Container { // CraftBukkit start CraftItemStack item = CraftItemStack.asCraftMirror(itemstack); PrepareItemEnchantEvent event = new PrepareItemEnchantEvent(player, this.getBukkitView(), this.world.getWorld().getBlockAt(this.x, this.y, this.z), item, this.costs, i); - event.setCancelled(!itemstack.w()); + event.setCancelled(!itemstack.x()); this.world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -229,7 +229,7 @@ public class ContainerEnchantTable extends Container { ItemStack itemstack = null; Slot slot = (Slot) this.c.get(i); - if (slot != null && slot.d()) { + if (slot != null && slot.e()) { ItemStack itemstack1 = slot.getItem(); itemstack = itemstack1.cloneItemStack(); @@ -238,7 +238,7 @@ public class ContainerEnchantTable extends Container { return null; } } else { - if (((Slot) this.c.get(0)).d() || !((Slot) this.c.get(0)).isAllowed(itemstack1)) { + if (((Slot) this.c.get(0)).e() || !((Slot) this.c.get(0)).isAllowed(itemstack1)) { return null; } @@ -254,7 +254,7 @@ public class ContainerEnchantTable extends Container { if (itemstack1.count == 0) { slot.set((ItemStack) null); } else { - slot.e(); + slot.f(); } if (itemstack1.count == itemstack.count) { -- cgit v1.2.3