Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 14:33:56 +01:00
Code Issues Projects Releases Wiki Activity

[Bleeding] Correct issues with MEGA_REDWOOD trees. Fixes BUKKIT-5568

Browse Source 
In commit 6efeddfe57, TALL_REDWOOD was used instead of the proper TreeType
of MEGA_REDWOOD. Additionally, this fixes an issue in CraftWorld with an
improper boolean flag related to the generation of MEGA_REDWOOD trees.
This commit is contained in:
GJ 2014-04-28 09:49:33 -04:00
parent 576758bc55
commit d91ee7d7ab
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/BlockSapling.java
View File

@ -94,7 +94,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
for (i1 = 0; i1 >= -1; --i1) { for (i1 = 0; i1 >= -1; --i1) {
for (j1 = 0; j1 >= -1; --j1) { for (j1 = 0; j1 >= -1; --j1) {
if (this.a(world, i + i1, j, k + j1, 1) && this.a(world, i + i1 + 1, j, k + j1, 1) && this.a(world, i + i1, j, k + j1 + 1, 1) && this.a(world, i + i1 + 1, j, k + j1 + 1, 1)) { if (this.a(world, i + i1, j, k + j1, 1) && this.a(world, i + i1 + 1, j, k + j1, 1) && this.a(world, i + i1, j, k + j1 + 1, 1) && this.a(world, i + i1 + 1, j, k + j1 + 1, 1)) {
treeType = TreeType.TALL_REDWOOD; // CraftBukkit treeType = TreeType.MEGA_REDWOOD; // CraftBukkit
object = new WorldGenMegaTree(false, random.nextBoolean()); object = new WorldGenMegaTree(false, random.nextBoolean());
flag = true; flag = true;
break label78; break label78;

2
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -393,7 +393,7 @@ public class CraftWorld implements World {
gen = new WorldGenForestTree(true); gen = new WorldGenForestTree(true);
break; break;
case MEGA_REDWOOD: case MEGA_REDWOOD:
gen = new WorldGenMegaTree(true, rand.nextBoolean()); gen = new WorldGenMegaTree(false, rand.nextBoolean());
break; break;
case TALL_BIRCH: case TALL_BIRCH:
gen = new WorldGenForest(true, true); gen = new WorldGenForest(true, true);