summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-02-03 21:26:17 +0100
committerTycho <work.tycho+git@gmail.com>2014-02-03 21:26:17 +0100
commit80807eec2cc1c497c4766a0c7cddb9c3ddc29e45 (patch)
tree4655d0f74ce54797b73e4863c2df30134ea74763 /src/World.cpp
parentMerge pull request #623 from mc-server/tnt (diff)
downloadcuberite-80807eec2cc1c497c4766a0c7cddb9c3ddc29e45.tar
cuberite-80807eec2cc1c497c4766a0c7cddb9c3ddc29e45.tar.gz
cuberite-80807eec2cc1c497c4766a0c7cddb9c3ddc29e45.tar.bz2
cuberite-80807eec2cc1c497c4766a0c7cddb9c3ddc29e45.tar.lz
cuberite-80807eec2cc1c497c4766a0c7cddb9c3ddc29e45.tar.xz
cuberite-80807eec2cc1c497c4766a0c7cddb9c3ddc29e45.tar.zst
cuberite-80807eec2cc1c497c4766a0c7cddb9c3ddc29e45.zip
Diffstat (limited to '')
-rw-r--r--src/World.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/World.cpp b/src/World.cpp
index de2002b84..f9a6e7776 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -1222,7 +1222,7 @@ void cWorld::GrowTreeByBiome(int a_X, int a_Y, int a_Z)
{
cNoise Noise(m_Generator.GetSeed());
sSetBlockVector Logs, Other;
- GetTreeImageByBiome(a_X, a_Y, a_Z, Noise, (int)(m_WorldAge & 0xffffffff), (EMCSBiome)GetBiomeAt(a_X, a_Z), Logs, Other);
+ GetTreeImageByBiome(a_X, a_Y, a_Z, Noise, (int)(m_WorldAge & 0xffffffff), GetBiomeAt(a_X, a_Z), Logs, Other);
Other.insert(Other.begin(), Logs.begin(), Logs.end());
Logs.clear();
GrowTreeImage(Other);
@@ -1475,7 +1475,7 @@ void cWorld::GrowSugarcane(int a_BlockX, int a_BlockY, int a_BlockZ, int a_NumBl
-int cWorld::GetBiomeAt (int a_BlockX, int a_BlockZ)
+EMCSBiome cWorld::GetBiomeAt (int a_BlockX, int a_BlockZ)
{
return m_ChunkMap->GetBiomeAt(a_BlockX, a_BlockZ);
}