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

@@ -37,16 +37,16 @@ public class ItemBed extends Item {
}
if (entityhuman.a(i, j, k, l, itemstack) && entityhuman.a(i + b0, j, k + b1, l, itemstack)) {
if (world.isEmpty(i, j, k) && world.isEmpty(i + b0, j, k + b1) && world.v(i, j - 1, k) && world.v(i + b0, j - 1, k + b1)) {
if (world.isEmpty(i, j, k) && world.isEmpty(i + b0, j, k + b1) && world.w(i, j - 1, k) && world.v(i + b0, j - 1, k + b1)) {
// CraftBukkit start
// world.setTypeIdAndData(i, j, k, blockbed.id, i1);
// world.setTypeIdAndData(i, j, k, blockbed.id, i1, 3);
if (!ItemBlock.processBlockPlace(world, entityhuman, null, i, j, k, blockbed.id, i1, clickedX, clickedY, clickedZ)) {
return false;
}
// CraftBukkit end
if (world.getTypeId(i, j, k) == blockbed.id) {
world.setTypeIdAndData(i + b0, j, k + b1, blockbed.id, i1 + 8);
world.setTypeIdAndData(i + b0, j, k + b1, blockbed.id, i1 + 8, 3);
}
--itemstack.count;