summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorBlackHole <black-hole@live.com>2013-12-14 22:54:24 -0700
committerNate Mortensen <nate.richard.mortensen@gmail.com>2013-12-16 19:47:49 -0700
commit9a6d035998b7bcc2da98e4507e1afa265d920c46 (patch)
tree3633e202f674cfe9e7e9b1ff713c1850cc704be3 /src/main/java/org
parent2191599f4b70635e39ef85cde3c852a5c468acb6 (diff)
downloadcraftbukkit-9a6d035998b7bcc2da98e4507e1afa265d920c46.tar
craftbukkit-9a6d035998b7bcc2da98e4507e1afa265d920c46.tar.gz
craftbukkit-9a6d035998b7bcc2da98e4507e1afa265d920c46.tar.lz
craftbukkit-9a6d035998b7bcc2da98e4507e1afa265d920c46.tar.xz
craftbukkit-9a6d035998b7bcc2da98e4507e1afa265d920c46.zip
Add missed tree types for Minecraft 1.7. Adds BUKKIT-5042
This commit adds support for the Tree Types that weren't added in the initial update to Minecraft 1.7. Pulled from PR #1277
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftWorld.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ed5dbb5f..3d0383df 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -393,6 +393,12 @@ public class CraftWorld implements World {
case DARK_OAK:
gen = new WorldGenForestTree(true);
break;
+ case MEGA_REDWOOD:
+ gen = new WorldGenMegaTree(true, rand.nextBoolean());
+ break;
+ case TALL_BIRCH:
+ gen = new WorldGenForest(true, true);
+ break;
case TREE:
default:
gen = new WorldGenTrees(true);