diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
commit | 5b2c774edc069f70d1fa9940d96bb0b8705bef7a (patch) | |
tree | 79d1800e7154bba7b5fca4f8c8373ee4376cca89 /src/main/java/net/minecraft/server/WorldGenTaiga2.java | |
parent | 54bcd1c1f36691a714234e5ca2f30a20b3ad2816 (diff) | |
download | craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.gz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.lz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.xz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.zip |
Update for Minecraft 1.8
Diffstat (limited to 'src/main/java/net/minecraft/server/WorldGenTaiga2.java')
-rw-r--r-- | src/main/java/net/minecraft/server/WorldGenTaiga2.java | 136 |
1 files changed, 74 insertions, 62 deletions
diff --git a/src/main/java/net/minecraft/server/WorldGenTaiga2.java b/src/main/java/net/minecraft/server/WorldGenTaiga2.java index d384a64e..61947368 100644 --- a/src/main/java/net/minecraft/server/WorldGenTaiga2.java +++ b/src/main/java/net/minecraft/server/WorldGenTaiga2.java @@ -25,91 +25,103 @@ public class WorldGenTaiga2 extends WorldGenerator { int k1 = 2 + random.nextInt(2); boolean flag = true; - if (j >= 1 && j + l + 1 <= 128) { - int l1; - int i2; - int j2; - int k2; - - for (l1 = j; l1 <= j + 1 + l && flag; ++l1) { - boolean flag1 = true; - - if (l1 - j < i1) { - k2 = 0; - } else { - k2 = k1; - } + if (j >= 1) { + int l1 = j + l + 1; + + world.getClass(); + if (l1 <= 128) { + int i2; + int j2; + int k2; + int l2; + + for (i2 = j; i2 <= j + 1 + l && flag; ++i2) { + boolean flag1 = true; + + if (i2 - j < i1) { + l2 = 0; + } else { + l2 = k1; + } - for (i2 = i - k2; i2 <= i + k2 && flag; ++i2) { - for (int l2 = k - k2; l2 <= k + k2 && flag; ++l2) { - if (l1 >= 0 && l1 < 128) { - j2 = world.getTypeId(i2, l1, l2); - if (j2 != 0 && j2 != Block.LEAVES.id) { - flag = false; + for (j2 = i - l2; j2 <= i + l2 && flag; ++j2) { + for (int i3 = k - l2; i3 <= k + l2 && flag; ++i3) { + if (i2 >= 0) { + world.getClass(); + if (i2 < 128) { + k2 = world.getTypeId(j2, i2, i3); + if (k2 != 0 && k2 != Block.LEAVES.id) { + flag = false; + } + continue; + } } - } else { + flag = false; } } } - } - if (!flag) { - return false; - } else { - l1 = world.getTypeId(i, j - 1, k); - if ((l1 == Block.GRASS.id || l1 == Block.DIRT.id) && j < 128 - l - 1) { - world.setRawTypeId(i, j - 1, k, Block.DIRT.id); - k2 = random.nextInt(2); - i2 = 1; - byte b0 = 0; + if (!flag) { + return false; + } - int i3; - int j3; + i2 = world.getTypeId(i, j - 1, k); + if (i2 == Block.GRASS.id || i2 == Block.DIRT.id) { + world.getClass(); + if (j < 128 - l - 1) { + world.setRawTypeId(i, j - 1, k, Block.DIRT.id); + l2 = random.nextInt(2); + j2 = 1; + byte b0 = 0; - for (j2 = 0; j2 <= j1; ++j2) { - j3 = j + l - j2; + int j3; + int k3; - for (i3 = i - k2; i3 <= i + k2; ++i3) { - int k3 = i3 - i; + for (k2 = 0; k2 <= j1; ++k2) { + k3 = j + l - k2; - for (int l3 = k - k2; l3 <= k + k2; ++l3) { - int i4 = l3 - k; + for (j3 = i - l2; j3 <= i + l2; ++j3) { + int l3 = j3 - i; - if ((Math.abs(k3) != k2 || Math.abs(i4) != k2 || k2 <= 0) && !Block.o[world.getTypeId(i3, j3, l3)]) { - world.setRawTypeIdAndData(i3, j3, l3, Block.LEAVES.id, 1); + for (int i4 = k - l2; i4 <= k + l2; ++i4) { + int j4 = i4 - k; + + if ((Math.abs(l3) != l2 || Math.abs(j4) != l2 || l2 <= 0) && !Block.o[world.getTypeId(j3, k3, i4)]) { + world.setRawTypeIdAndData(j3, k3, i4, Block.LEAVES.id, 1); + } } } - } - if (k2 >= i2) { - k2 = b0; - b0 = 1; - ++i2; - if (i2 > k1) { - i2 = k1; + if (l2 >= j2) { + l2 = b0; + b0 = 1; + ++j2; + if (j2 > k1) { + j2 = k1; + } + } else { + ++l2; } - } else { - ++k2; } - } - j2 = random.nextInt(3); + k2 = random.nextInt(3); - for (j3 = 0; j3 < l - j2; ++j3) { - i3 = world.getTypeId(i, j + j3, k); - if (i3 == 0 || i3 == Block.LEAVES.id) { - world.setRawTypeIdAndData(i, j + j3, k, Block.LOG.id, 1); + for (k3 = 0; k3 < l - k2; ++k3) { + j3 = world.getTypeId(i, j + k3, k); + if (j3 == 0 || j3 == Block.LEAVES.id) { + world.setRawTypeIdAndData(i, j + k3, k, Block.LOG.id, 1); + } } - } - return true; - } else { - return false; + return true; + } } + + return false; } - } else { - return false; } + + return false; } } |