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/WorldGenTrees.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/WorldGenTrees.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/WorldGenTrees.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/WorldGenTrees.java b/src/main/java/net/minecraft/server/WorldGenTrees.java index d0d49bff..4d8b04f2 100644 --- a/src/main/java/net/minecraft/server/WorldGenTrees.java +++ b/src/main/java/net/minecraft/server/WorldGenTrees.java @@ -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); + } } } } |