Update CraftBukkit to Minecraft 1.7.2

This commit is contained in:
mbax
2013-11-04 07:07:38 -06:00
committed by Wesley Wolfe
parent ff8b70fbb7
commit 2726696652
349 changed files with 14339 additions and 11287 deletions

View File

@@ -2,8 +2,7 @@ package net.minecraft.server;
public class ItemSign extends Item {
public ItemSign(int i) {
super(i);
public ItemSign() {
this.maxStackSize = 16;
this.a(CreativeModeTab.c);
}
@@ -12,7 +11,7 @@ public class ItemSign extends Item {
final int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit
if (l == 0) {
return false;
} else if (!world.getMaterial(i, j, k).isBuildable()) {
} else if (!world.getType(i, j, k).getMaterial().isBuildable()) {
return false;
} else {
if (l == 1) {
@@ -37,7 +36,7 @@ public class ItemSign extends Item {
if (!entityhuman.a(i, j, k, l, itemstack)) {
return false;
} else if (!Block.SIGN_POST.canPlace(world, i, j, k)) {
} else if (!Blocks.SIGN_POST.canPlace(world, i, j, k)) {
return false;
} else if (world.isStatic) {
return true;
@@ -47,14 +46,14 @@ public class ItemSign extends Item {
if (l == 1) {
int i1 = MathHelper.floor((double) ((entityhuman.yaw + 180.0F) * 16.0F / 360.0F) + 0.5D) & 15;
// world.setTypeIdAndData(i, j, k, Block.SIGN_POST.id, i1, 3);
block = Block.SIGN_POST;
// world.setTypeAndData(i, j, k, Blocks.SIGN_POST, i1, 3);
block = Blocks.SIGN_POST;
l = i1;
} else {
// world.setTypeIdAndData(i, j, k, Block.WALL_SIGN.id, l, 3);
block = Block.WALL_SIGN;
// world.setTypeAndData(i, j, k, Blocks.WALL_SIGN, l, 3);
block = Blocks.WALL_SIGN;
}
if (!ItemBlock.processBlockPlace(world, entityhuman, null, i, j, k, block.id, l, clickedX, clickedY, clickedZ)) {
if (!ItemBlock.processBlockPlace(world, entityhuman, null, i, j, k, block, l, clickedX, clickedY, clickedZ)) {
return false;
}
// CraftBukkit end