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

@@ -62,7 +62,7 @@ public class BlockSapling extends BlockFlower {
} else if (l == 3) {
for (i1 = 0; i1 >= -1; --i1) {
for (j1 = 0; j1 >= -1; --j1) {
if (world.getTypeId(i + i1, j, k + j1) == this.id && world.getTypeId(i + i1 + 1, j, k + j1) == this.id && world.getTypeId(i + i1, j, k + j1 + 1) == this.id && world.getTypeId(i + i1 + 1, j, k + j1 + 1) == this.id) {
if (this.f(world, i + i1, j, k + j1, 3) && this.f(world, i + i1 + 1, j, k + j1, 3) && this.f(world, i + i1, j, k + j1 + 1, 3) && this.f(world, i + i1 + 1, j, k + j1 + 1, 3)) {
treeType = TreeType.JUNGLE;
gen = new WorldGenMegaTree(false, 10 + random.nextInt(20), 3, 3);
flag = true;
@@ -127,6 +127,10 @@ public class BlockSapling extends BlockFlower {
// CraftBukkit end
}
public boolean f(World world, int i, int j, int k, int l) {
return world.getTypeId(i, j, k) == this.id && (world.getData(i, j, k) & 3) == l;
}
protected int getDropData(int i) {
return i & 3;
}