OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 13:07:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Allow the new jungle tree type to be grown both as a single sapling and as a group of 4. Fixes BUKKIT-886

Browse source
This commit is contained in:
md_5 2012-03-02 20:50:18 +11:00 committed by Nathan Adams
parent 94d4d68211
commit 5198f2efb4
1 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/main/java/net/minecraft/server/BlockSapling.java
View file

@ -44,24 +44,51 @@ public class BlockSapling extends BlockFlower {
public void grow(World world, int i, int j, int k, Random random, boolean bonemeal, Player player, ItemStack itemstack) { public void grow(World world, int i, int j, int k, Random random, boolean bonemeal, Player player, ItemStack itemstack) {
int l = world.getData(i, j, k) & 3; int l = world.getData(i, j, k) & 3;
world.setRawTypeId(i, j, k, 0);
// CraftBukkit start - records tree generation and calls StructureGrowEvent // CraftBukkit start - records tree generation and calls StructureGrowEvent
StructureGrowDelegate delegate = new StructureGrowDelegate(world); StructureGrowDelegate delegate = new StructureGrowDelegate(world);
TreeType treeType; TreeType treeType;
boolean grownTree; int i1 = 0;
int j1 = 0;
boolean grownTree = false;
boolean megaTree = false;
// All of these are 'false' because we need the 'raw' calls so the block-delegate works // All of these are 'false' because we need the 'raw' calls so the block-delegate works
if (l == 1) { if (l == 1) {
treeType = TreeType.REDWOOD; treeType = TreeType.REDWOOD;
world.setRawTypeId(i, j, k, 0);
grownTree = new WorldGenTaiga2(false).generate(delegate, random, i, j, k); grownTree = new WorldGenTaiga2(false).generate(delegate, random, i, j, k);
} else if (l == 2) { } else if (l == 2) {
treeType = TreeType.BIRCH; treeType = TreeType.BIRCH;
world.setRawTypeId(i, j, k, 0);
grownTree = new WorldGenForest(false).generate(delegate, random, i, j, k); grownTree = new WorldGenForest(false).generate(delegate, random, i, j, k);
} else if (l == 3) {
treeType = TreeType.JUNGLE;
for (i1 = 0; i1 >= -1; --i1) {
for (j1 = 0; j1 >= -1; --j1) {
if (world.getTypeId(i + i1, j, k + j1) == this.id && world.getTypeId(i + i1 + 1, j, k + j1) == this.id && world.getTypeId(i + i1, j, k + j1 + 1) == this.id && world.getTypeId(i + i1 + 1, j, k + j1 + 1) == this.id) {
world.setRawTypeId(i + i1, j, k + j1, 0);
world.setRawTypeId(i + i1 + 1, j, k + j1, 0);
world.setRawTypeId(i + i1, j, k + j1 + 1, 0);
world.setRawTypeId(i + i1 + 1, j, k + j1 + 1, 0);
grownTree = new WorldGenMegaTree(false, 10 + random.nextInt(20), 3, 3).generate(delegate, random, i + i1, j, k + j1);
megaTree = true;
break;
}
}
}
if (!grownTree) {
j1 = 0;
i1 = 0;
world.setRawTypeId(i, j, k, 0);
grownTree = new WorldGenTrees(false, 4 + random.nextInt(7), 3, 3, false).generate(delegate, random, i, j, k);
}
} else { } else {
if (random.nextInt(10) == 0) { if (random.nextInt(10) == 0) {
treeType = TreeType.BIG_TREE; treeType = TreeType.BIG_TREE;
world.setRawTypeId(i, j, k, 0);
grownTree = new WorldGenBigTree(false).generate(delegate, random, i, j, k); grownTree = new WorldGenBigTree(false).generate(delegate, random, i, j, k);
} else { } else {
treeType = TreeType.TREE; treeType = TreeType.TREE;
world.setRawTypeId(i, j, k, 0);
grownTree = new WorldGenTrees(false).generate(delegate, random, i, j, k); grownTree = new WorldGenTrees(false).generate(delegate, random, i, j, k);
} }
} }
@ -83,8 +110,15 @@ public class BlockSapling extends BlockFlower {
} }
if (!grownTree) { if (!grownTree) {
// CraftBukkit end if (megaTree) {
world.setRawTypeIdAndData(i, j, k, this.id, l); // CraftBukkit end
world.setRawTypeIdAndData(i + i1, j, k + j1, this.id, l);
world.setRawTypeIdAndData(i + i1 + 1, j, k + j1, this.id, l);
world.setRawTypeIdAndData(i + i1, j, k + j1 + 1, this.id, l);
world.setRawTypeIdAndData(i + i1 + 1, j, k + j1 + 1, this.id, l);
} else {
world.setRawTypeIdAndData(i, j, k, this.id, l);
}
} }
} }