summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorBlackHole <black-hole@live.com>2013-12-04 18:51:57 +0100
committerNate Mortensen <nate.richard.mortensen@gmail.com>2013-12-16 19:48:16 -0700
commitecd5a027534fdcf42f68a3a4321792cd3bb51756 (patch)
tree4c65d7596341342077055603b8d575ac8afd2ad0 /src/main
parentbe55b4f5b8274c1124fe957e6a3259789f6e9747 (diff)
downloadbukkit-ecd5a027534fdcf42f68a3a4321792cd3bb51756.tar
bukkit-ecd5a027534fdcf42f68a3a4321792cd3bb51756.tar.gz
bukkit-ecd5a027534fdcf42f68a3a4321792cd3bb51756.tar.lz
bukkit-ecd5a027534fdcf42f68a3a4321792cd3bb51756.tar.xz
bukkit-ecd5a027534fdcf42f68a3a4321792cd3bb51756.zip
Add missed tree types for Minecraft 1.7. Adds BUKKIT-5042
The Minecraft 1.7 update added two new types of trees that weren't added in the initial update to 1.7: MEGA_REDWOOD and TALL_BIRCH. Pulled from PR #979
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/TreeType.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/TreeType.java b/src/main/java/org/bukkit/TreeType.java
index 91229278..bae8232e 100644
--- a/src/main/java/org/bukkit/TreeType.java
+++ b/src/main/java/org/bukkit/TreeType.java
@@ -57,4 +57,12 @@ public enum TreeType {
* Dark Oak tree.
*/
DARK_OAK,
+ /**
+ * Mega redwood tree; 4 blocks wide and tall
+ */
+ MEGA_REDWOOD,
+ /**
+ * Tall birch tree
+ */
+ TALL_BIRCH,
}