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

@@ -70,8 +70,12 @@ public class WorldGenForest extends WorldGenerator implements BlockSapling.TreeG
for (int k2 = k - k1; k2 <= k + k1; ++k2) {
int l2 = k2 - k;
if ((Math.abs(j2) != k1 || Math.abs(l2) != k1 || random.nextInt(2) != 0 && j1 != 0) && !Block.q[world.getTypeId(l1, i2, k2)]) {
this.setTypeAndData(world, l1, i2, k2, Block.LEAVES.id, 2);
if (Math.abs(j2) != k1 || Math.abs(l2) != k1 || random.nextInt(2) != 0 && j1 != 0) {
int i3 = world.getTypeId(l1, i2, k2);
if (i3 == 0 || i3 == Block.LEAVES.id) {
this.setTypeAndData(world, l1, i2, k2, Block.LEAVES.id, 2);
}
}
}
}