Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.

This commit is contained in:
Nathan Adams
2012-03-22 20:39:39 +00:00
parent 8dc7417a3d
commit 9d09e7d016
94 changed files with 647 additions and 1944 deletions

View File

@@ -72,7 +72,7 @@ public class WorldGenTrees extends WorldGenerator implements BlockSapling.TreeGe
} else {
i1 = world.getTypeId(i, j - 1, k);
if ((i1 == Block.GRASS.id || i1 == Block.DIRT.id) && j < 256 - l - 1) {
this.setTypeAndData(world, i, j - 1, k, Block.DIRT.id, 0); // CraftBukkit
this.setType(world, i, j - 1, k, Block.DIRT.id);
b0 = 3;
byte b1 = 0;
@@ -130,19 +130,19 @@ public class WorldGenTrees extends WorldGenerator implements BlockSapling.TreeGe
for (k2 = k - i2; k2 <= k + i2; ++k2) {
if (world.getTypeId(j2, j1, k2) == Block.LEAVES.id) {
if (random.nextInt(4) == 0 && world.getTypeId(j2 - 1, j1, k2) == 0) {
this.a(world, j2 - 1, j1, k2, 8);
this.b(world, j2 - 1, j1, k2, 8);
}
if (random.nextInt(4) == 0 && world.getTypeId(j2 + 1, j1, k2) == 0) {
this.a(world, j2 + 1, j1, k2, 2);
this.b(world, j2 + 1, j1, k2, 2);
}
if (random.nextInt(4) == 0 && world.getTypeId(j2, j1, k2 - 1) == 0) {
this.a(world, j2, j1, k2 - 1, 1);
this.b(world, j2, j1, k2 - 1, 1);
}
if (random.nextInt(4) == 0 && world.getTypeId(j2, j1, k2 + 1) == 0) {
this.a(world, j2, j1, k2 + 1, 4);
this.b(world, j2, j1, k2 + 1, 4);
}
}
}
@@ -161,8 +161,8 @@ public class WorldGenTrees extends WorldGenerator implements BlockSapling.TreeGe
}
// CraftBukkit - Changed world to BlockChangeDelegate
private void a(BlockChangeDelegate world, int i, int j, int k, int l) {
this.setTypeAndData(world, i, j, k, Block.VINE.id, l); // CraftBukkit
private void b(BlockChangeDelegate world, int i, int j, int k, int l) {
this.setTypeAndData(world, i, j, k, Block.VINE.id, l);
int i1 = 4;
while (true) {
@@ -171,7 +171,7 @@ public class WorldGenTrees extends WorldGenerator implements BlockSapling.TreeGe
return;
}
this.setTypeAndData(world, i, j, k, Block.VINE.id, l); // CraftBukkit
this.setTypeAndData(world, i, j, k, Block.VINE.id, l);
--i1;
}
}