Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.

Browse Source
This commit is contained in:
Nathan Adams
2012-03-22 20:39:39 +00:00
parent 8dc7417a3d
commit 9d09e7d016
94 changed files with 647 additions and 1944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/minecraft/server/WorldGenSwampTree.java
View File

@@ -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;
}
}