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

@@ -86,8 +86,12 @@ public class WorldGenTrees extends WorldGenerator implements BlockSapling.TreeGe
for (int l2 = k - i2; l2 <= k + i2; ++l2) {
int i3 = l2 - k;
if ((Math.abs(k2) != i2 || Math.abs(i3) != i2 || random.nextInt(2) != 0 && k1 != 0) && world.isEmpty(j2, j1, l2)) {
this.setTypeAndData(world, j2, j1, l2, Block.LEAVES.id, this.d);
if (Math.abs(k2) != i2 || Math.abs(i3) != i2 || random.nextInt(2) != 0 && k1 != 0) {
int j3 = world.getTypeId(j2, j1, l2);
if (j3 == 0 || j3 == Block.LEAVES.id) {
this.setTypeAndData(world, j2, j1, l2, Block.LEAVES.id, this.d);
}
}
}
}