summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/WorldGenForest.java
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2012-03-01 10:49:23 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2012-03-01 14:38:31 +0000
commit543c4879fee3b7165764c5371d226c93fe3a657b (patch)
tree4fe9116464e1fe42a40dc3ba19b58234bd26f821 /src/main/java/net/minecraft/server/WorldGenForest.java
parente9ca87000c1794715bc3fe0a7d1caaf809057635 (diff)
downloadcraftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar
craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.gz
craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.lz
craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.xz
craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.zip
Updated CraftBukkit to 1.2
Diffstat (limited to 'src/main/java/net/minecraft/server/WorldGenForest.java')
-rw-r--r--src/main/java/net/minecraft/server/WorldGenForest.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/WorldGenForest.java b/src/main/java/net/minecraft/server/WorldGenForest.java
index 831a3b25..e52f535b 100644
--- a/src/main/java/net/minecraft/server/WorldGenForest.java
+++ b/src/main/java/net/minecraft/server/WorldGenForest.java
@@ -24,7 +24,7 @@ public class WorldGenForest extends WorldGenerator {
int l = random.nextInt(3) + 5;
boolean flag = true;
- if (j >= 1 && j + l + 1 <= world.getHeight()) { // CraftBukkit
+ if (j >= 1 && j + l + 1 <= 128) {
int i1;
int j1;
int k1;
@@ -43,7 +43,7 @@ public class WorldGenForest extends WorldGenerator {
for (j1 = i - b0; j1 <= i + b0 && flag; ++j1) {
for (k1 = k - b0; k1 <= k + b0 && flag; ++k1) {
- if (i1 >= 0 && i1 < world.getHeight()) { // CraftBukkit
+ if (i1 >= 0 && i1 < 128) {
l1 = world.getTypeId(j1, i1, k1);
if (l1 != 0 && l1 != Block.LEAVES.id) {
flag = false;
@@ -59,8 +59,9 @@ public class WorldGenForest extends WorldGenerator {
return false;
} else {
i1 = world.getTypeId(i, j - 1, k);
- if ((i1 == Block.GRASS.id || i1 == Block.DIRT.id) && j < world.getHeight() - l - 1) { // CraftBukkit
+ if ((i1 == Block.GRASS.id || i1 == Block.DIRT.id) && j < 128 - l - 1) {
world.setRawTypeId(i, j - 1, k, Block.DIRT.id);
+
int i2;
for (i2 = j - 3 + l; i2 <= j + l; ++i2) {
@@ -73,7 +74,7 @@ public class WorldGenForest extends WorldGenerator {
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.o[world.getTypeId(l1, i2, k2)]) {
+ if ((Math.abs(j2) != k1 || Math.abs(l2) != k1 || random.nextInt(2) != 0 && j1 != 0) && !Block.n[world.getTypeId(l1, i2, k2)]) {
this.setTypeAndData(world, l1, i2, k2, Block.LEAVES.id, 2);
}
}