Update CraftBukkit to Minecraft 1.4(.2).

This commit is contained in:
Travis Watkins
2012-10-24 22:53:23 -05:00
committed by EvilSeph
parent b9a72531b6
commit 60819c6693
237 changed files with 10104 additions and 4863 deletions

View File

@@ -81,7 +81,7 @@ public class ContainerEnchantTable extends Container {
ItemStack itemstack = iinventory.getItem(0);
int i;
if (itemstack != null && itemstack.u()) {
if (itemstack != null && itemstack.v()) {
this.f = this.l.nextLong();
if (!this.world.isStatic) {
i = 0;
@@ -171,7 +171,7 @@ public class ContainerEnchantTable extends Container {
return false;
}
entityhuman.levelDown(level);
entityhuman.levelDown(-level);
for (Map.Entry<org.bukkit.enchantments.Enchantment, Integer> entry : event.getEnchantsToAdd().entrySet()) {
try {
item.addEnchantment(entry.getKey(), entry.getValue());
@@ -207,7 +207,7 @@ public class ContainerEnchantTable extends Container {
return this.world.getTypeId(this.x, this.y, this.z) != Block.ENCHANTMENT_TABLE.id ? false : entityhuman.e((double) this.x + 0.5D, (double) this.y + 0.5D, (double) this.z + 0.5D) <= 64.0D;
}
public ItemStack b(int i) {
public ItemStack b(EntityHuman entityhuman, int i) {
ItemStack itemstack = null;
Slot slot = (Slot) this.b.get(i);
@@ -243,7 +243,7 @@ public class ContainerEnchantTable extends Container {
return null;
}
slot.b(itemstack1);
slot.a(entityhuman, itemstack1);
}
return itemstack;