summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorSamuel Barney <samjbarney@gmail.com>2015-07-13 19:02:00 +0200
committerSamuel Barney <samjbarney@gmail.com>2015-07-13 23:24:38 +0200
commitd017fe5e392636e684dd287f69ebc45334fd5969 (patch)
tree866ccff11b5ba053d8d9da0caa42d5e7f77e184f /src/World.cpp
parentMerge pull request #2344 from bibo38/make_ptr (diff)
downloadcuberite-d017fe5e392636e684dd287f69ebc45334fd5969.tar
cuberite-d017fe5e392636e684dd287f69ebc45334fd5969.tar.gz
cuberite-d017fe5e392636e684dd287f69ebc45334fd5969.tar.bz2
cuberite-d017fe5e392636e684dd287f69ebc45334fd5969.tar.lz
cuberite-d017fe5e392636e684dd287f69ebc45334fd5969.tar.xz
cuberite-d017fe5e392636e684dd287f69ebc45334fd5969.tar.zst
cuberite-d017fe5e392636e684dd287f69ebc45334fd5969.zip
Diffstat (limited to '')
-rw-r--r--src/World.cpp18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 83a8b6c10..123e4a8da 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -1393,9 +1393,23 @@ void cWorld::GrowTreeFromSapling(int a_X, int a_Y, int a_Z, NIBBLETYPE a_Sapling
case E_META_SAPLING_APPLE: GetAppleTreeImage (a_X, a_Y, a_Z, Noise, WorldAge, Logs, Other); break;
case E_META_SAPLING_BIRCH: GetBirchTreeImage (a_X, a_Y, a_Z, Noise, WorldAge, Logs, Other); break;
case E_META_SAPLING_CONIFER: GetConiferTreeImage(a_X, a_Y, a_Z, Noise, WorldAge, Logs, Other); break;
- case E_META_SAPLING_JUNGLE: GetJungleTreeImage (a_X, a_Y, a_Z, Noise, WorldAge, Logs, Other); break;
case E_META_SAPLING_ACACIA: GetAcaciaTreeImage (a_X, a_Y, a_Z, Noise, WorldAge, Logs, Other); break;
- case E_META_SAPLING_DARK_OAK: GetDarkoakTreeImage(a_X, a_Y, a_Z, Noise, WorldAge, Logs, Other); break;
+ case E_META_SAPLING_JUNGLE:
+ {
+ bool IsLarge = GetLargeTreeAdjustment(*this, a_X, a_Y, a_Z, a_SaplingMeta);
+ GetJungleTreeImage (a_X, a_Y, a_Z, Noise, WorldAge, Logs, Other, IsLarge);
+ break;
+ }
+ case E_META_SAPLING_DARK_OAK:
+ {
+ if (!GetLargeTreeAdjustment(*this, a_X, a_Y, a_Z, a_SaplingMeta))
+ {
+ return;
+ }
+
+ GetDarkoakTreeImage(a_X, a_Y, a_Z, Noise, WorldAge, Logs, Other);
+ break;
+ }
}
Other.insert(Other.begin(), Logs.begin(), Logs.end());
Logs.clear();