OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-10 03:52:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Bleeding] Added support for all TreeType entries to CraftWorld.generateTree(). Addresses BUKKIT-1161

Browse source 
By: zml2008 <zach@zachsthings.com>
This commit is contained in:
CraftBukkit/Spigot 2012-03-13 19:38:39 -07:00
parent d6e7e41468
commit d434857d8a
2 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View file

@ -369,19 +369,45 @@ public class CraftWorld implements World {
} }
public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) { public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) {
BlockSapling.TreeGenerator gen;
switch (type) { switch (type) {
case BIG_TREE: case BIG_TREE:
return new WorldGenBigTree(false).generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); gen = new WorldGenBigTree(true);
break;
case BIRCH: case BIRCH:
return new WorldGenForest(false).generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); gen = new WorldGenForest(true);
break;
case REDWOOD: case REDWOOD:
return new WorldGenTaiga2(false).generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); gen = new WorldGenTaiga2(true);
break;
case TALL_REDWOOD: case TALL_REDWOOD:
return new WorldGenTaiga1().generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); gen = new WorldGenTaiga1();
break;
case JUNGLE:
gen = new WorldGenMegaTree(true, 10 + rand.nextInt(20), 3, 3);
break;
case SMALL_JUNGLE:
gen = new WorldGenTrees(true, 4 + rand.nextInt(7), 3, 3, false);
break;
case JUNGLE_BUSH:
gen = new WorldGenGroundBush(3, 0);
break;
case RED_MUSHROOM:
gen = new WorldGenHugeMushroom(1);
break;
case BROWN_MUSHROOM:
gen = new WorldGenHugeMushroom(0);
break;
case SWAMP:
gen = new WorldGenSwampTree();
break;
case TREE: case TREE:
default: default:
return new WorldGenTrees(false).generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); gen = new WorldGenTrees(true);
break;
} }
return gen.generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
} }
public TileEntity getTileEntityAt(final int x, final int y, final int z) { public TileEntity getTileEntityAt(final int x, final int y, final int z) {

8
paper-server/src/main/java/org/bukkit/craftbukkit/util/StructureGrowDelegate.java
View file

@ -30,6 +30,14 @@ public class StructureGrowDelegate implements BlockChangeDelegate {
return true; return true;
} }
public boolean setTypeId(int x, int y, int z, int typeId) {
return setRawTypeId(x, y, z, typeId);
}
public boolean setTypeIdAndData(int x, int y, int z, int typeId, int data) {
return setRawTypeIdAndData(x, y, z, typeId, data);
}
public int getTypeId(int x, int y, int z) { public int getTypeId(int x, int y, int z) {
return world.getBlockTypeIdAt(x, y, z); return world.getBlockTypeIdAt(x, y, z);
} }