Update CraftBukkit to Minecraft 1.5

This commit is contained in:
Travis Watkins
2013-03-13 17:33:27 -05:00
parent ba6e4c38cf
commit 83d29e461c
246 changed files with 8499 additions and 6759 deletions

View File

@@ -2,8 +2,8 @@ package net.minecraft.server;
public class ItemSkull extends Item {
private static final String[] a = new String[] { "skeleton", "wither", "zombie", "char", "creeper"};
private static final int[] b = new int[] { 224, 225, 226, 227, 228};
private static final String[] b = new String[] { "skeleton", "wither", "zombie", "char", "creeper"};
public static final String[] a = new String[] { "skull_skeleton", "skull_wither", "skull_zombie", "skull_char", "skull_creeper"};
public ItemSkull(int i) {
super(i);
@@ -45,7 +45,7 @@ public class ItemSkull extends Item {
return false;
} else {
// CraftBukkit start - handle in ItemBlock
// world.setTypeIdAndData(i, j, k, Block.SKULL.id, l);
// world.setTypeIdAndData(i, j, k, Block.SKULL.id, l, 2);
if (!ItemBlock.processBlockPlace(world, entityhuman, null, i, j, k, Block.SKULL.id, l, clickedX, clickedY, clickedZ)) {
return false;
}
@@ -84,11 +84,11 @@ public class ItemSkull extends Item {
public String d(ItemStack itemstack) {
int i = itemstack.getData();
if (i < 0 || i >= a.length) {
if (i < 0 || i >= b.length) {
i = 0;
}
return super.getName() + "." + a[i];
return super.getName() + "." + b[i];
}
public String l(ItemStack itemstack) {