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