diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-13 17:33:27 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-15 13:28:59 -0500 |
commit | 83d29e461c85733f0113b6eb19db6e3b42da2949 (patch) | |
tree | b3063a1c28f478ab368d5ba3413a842def68c28f /src/main/java/net/minecraft/server/WorldGenMegaTree.java | |
parent | ba6e4c38cfa98ad291974195cc46d70a4f138ac1 (diff) | |
download | craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.gz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.lz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.xz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.zip |
Update CraftBukkit to Minecraft 1.5
Diffstat (limited to 'src/main/java/net/minecraft/server/WorldGenMegaTree.java')
-rw-r--r-- | src/main/java/net/minecraft/server/WorldGenMegaTree.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/WorldGenMegaTree.java b/src/main/java/net/minecraft/server/WorldGenMegaTree.java index a49bcf4f..957b3e47 100644 --- a/src/main/java/net/minecraft/server/WorldGenMegaTree.java +++ b/src/main/java/net/minecraft/server/WorldGenMegaTree.java @@ -63,10 +63,10 @@ public class WorldGenMegaTree extends WorldGenerator implements BlockSapling.Tre } else { i1 = world.getTypeId(i, j - 1, k); if ((i1 == Block.GRASS.id || i1 == Block.DIRT.id) && j < 256 - l - 1) { - world.setRawTypeId(i, j - 1, k, Block.DIRT.id); - world.setRawTypeId(i + 1, j - 1, k, Block.DIRT.id); - world.setRawTypeId(i, j - 1, k + 1, Block.DIRT.id); - world.setRawTypeId(i + 1, j - 1, k + 1, Block.DIRT.id); + world.setTypeIdAndData(i, j - 1, k, Block.DIRT.id, 0); + world.setTypeIdAndData(i + 1, j - 1, k, Block.DIRT.id, 0); + world.setTypeIdAndData(i, j - 1, k + 1, Block.DIRT.id, 0); + world.setTypeIdAndData(i + 1, j - 1, k + 1, Block.DIRT.id, 0); this.a(world, i, k, j + l, 2, random); for (int i2 = j + l - 2 - random.nextInt(4); i2 > j + l / 2; i2 -= 2 + random.nextInt(4)) { @@ -167,8 +167,12 @@ public class WorldGenMegaTree extends WorldGenerator implements BlockSapling.Tre for (int j2 = j - k1; j2 <= j + k1 + 1; ++j2) { int k2 = j2 - j; - if ((i2 >= 0 || k2 >= 0 || i2 * i2 + k2 * k2 <= k1 * k1) && (i2 <= 0 && k2 <= 0 || i2 * i2 + k2 * k2 <= (k1 + 1) * (k1 + 1)) && (random.nextInt(4) != 0 || i2 * i2 + k2 * k2 <= (k1 - 1) * (k1 - 1)) && !Block.q[world.getTypeId(l1, i1, j2)]) { - this.setTypeAndData(world, l1, i1, j2, Block.LEAVES.id, this.c); + if ((i2 >= 0 || k2 >= 0 || i2 * i2 + k2 * k2 <= k1 * k1) && (i2 <= 0 && k2 <= 0 || i2 * i2 + k2 * k2 <= (k1 + 1) * (k1 + 1)) && (random.nextInt(4) != 0 || i2 * i2 + k2 * k2 <= (k1 - 1) * (k1 - 1))) { + int l2 = world.getTypeId(l1, i1, j2); + + if (l2 == 0 || l2 == Block.LEAVES.id) { + this.setTypeAndData(world, l1, i1, j2, Block.LEAVES.id, this.c); + } } } } |