diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-22 20:39:39 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-22 20:39:39 +0000 |
commit | 9d09e7d0167326d4169f734e4b6d04c54d767507 (patch) | |
tree | 898333912891b9c35a63994242fbd55d5b6ac2c6 /src/main/java/net/minecraft/server/WorldGenSwampTree.java | |
parent | 8dc7417a3d5c1af1e6434dc54952cfd5a8e90688 (diff) | |
download | craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.gz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.lz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.xz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.zip |
Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.
Diffstat (limited to 'src/main/java/net/minecraft/server/WorldGenSwampTree.java')
-rw-r--r-- | src/main/java/net/minecraft/server/WorldGenSwampTree.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/WorldGenSwampTree.java b/src/main/java/net/minecraft/server/WorldGenSwampTree.java index 0e2358db..d1adaaf9 100644 --- a/src/main/java/net/minecraft/server/WorldGenSwampTree.java +++ b/src/main/java/net/minecraft/server/WorldGenSwampTree.java @@ -59,7 +59,7 @@ public class WorldGenSwampTree extends WorldGenerator implements BlockSapling.T } else { i1 = world.getTypeId(i, j - 1, k); if ((i1 == Block.GRASS.id || i1 == Block.DIRT.id) && j < 128 - l - 1) { - this.setTypeAndData(world, i, j - 1, k, Block.DIRT.id, 0); // CraftBukkit + this.setType(world, i, j - 1, k, Block.DIRT.id); int i2; int j2; @@ -75,7 +75,7 @@ public class WorldGenSwampTree extends WorldGenerator implements BlockSapling.T int l2 = k2 - k; if ((Math.abs(i2) != k1 || Math.abs(l2) != k1 || random.nextInt(2) != 0 && j1 != 0) && !Block.n[world.getTypeId(l1, j2, k2)]) { - this.setTypeAndData(world, l1, j2, k2, Block.LEAVES.id, 0); // CraftBukkit + this.setType(world, l1, j2, k2, Block.LEAVES.id); } } } @@ -84,7 +84,7 @@ public class WorldGenSwampTree extends WorldGenerator implements BlockSapling.T for (j2 = 0; j2 < l; ++j2) { j1 = world.getTypeId(i, j + j2, k); if (j1 == 0 || j1 == Block.LEAVES.id || j1 == Block.WATER.id || j1 == Block.STATIONARY_WATER.id) { - this.setTypeAndData(world, i, j + j2, k, Block.LOG.id, 0); // CraftBukkit + this.setType(world, i, j + j2, k, Block.LOG.id); } } @@ -96,19 +96,19 @@ public class WorldGenSwampTree extends WorldGenerator implements BlockSapling.T for (i2 = k - k1; i2 <= k + k1; ++i2) { if (world.getTypeId(l1, j2, i2) == Block.LEAVES.id) { if (random.nextInt(4) == 0 && world.getTypeId(l1 - 1, j2, i2) == 0) { - this.a(world, l1 - 1, j2, i2, 8); + this.b(world, l1 - 1, j2, i2, 8); } if (random.nextInt(4) == 0 && world.getTypeId(l1 + 1, j2, i2) == 0) { - this.a(world, l1 + 1, j2, i2, 2); + this.b(world, l1 + 1, j2, i2, 2); } if (random.nextInt(4) == 0 && world.getTypeId(l1, j2, i2 - 1) == 0) { - this.a(world, l1, j2, i2 - 1, 1); + this.b(world, l1, j2, i2 - 1, 1); } if (random.nextInt(4) == 0 && world.getTypeId(l1, j2, i2 + 1) == 0) { - this.a(world, l1, j2, i2 + 1, 4); + this.b(world, l1, j2, i2 + 1, 4); } } } @@ -125,8 +125,9 @@ public class WorldGenSwampTree extends WorldGenerator implements BlockSapling.T } } - private void a(org.bukkit.BlockChangeDelegate world, int i, int j, int k, int l) { // CraftBukkit - change signature - this.setTypeAndData(world, i, j, k, Block.VINE.id, l); // CraftBukkit + // CraftBukkit - change signature + private void b(org.bukkit.BlockChangeDelegate world, int i, int j, int k, int l) { + this.setTypeAndData(world, i, j, k, Block.VINE.id, l); int i1 = 4; while (true) { @@ -135,7 +136,7 @@ public class WorldGenSwampTree extends WorldGenerator implements BlockSapling.T return; } - this.setTypeAndData(world, i, j, k, Block.VINE.id, l); // CraftBukkit + this.setTypeAndData(world, i, j, k, Block.VINE.id, l); --i1; } } |