summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Barney <samjbarney@gmail.com>2015-07-13 23:18:39 +0200
committerSamuel Barney <samjbarney@gmail.com>2015-07-15 19:04:09 +0200
commit4235feb7fd6995fae9261c3b90516d7e93b78ef0 (patch)
treeb98285871326d6726803e3aff6c079044bd29c07 /src
parentMerge pull request #2344 from bibo38/make_ptr (diff)
downloadcuberite-4235feb7fd6995fae9261c3b90516d7e93b78ef0.tar
cuberite-4235feb7fd6995fae9261c3b90516d7e93b78ef0.tar.gz
cuberite-4235feb7fd6995fae9261c3b90516d7e93b78ef0.tar.bz2
cuberite-4235feb7fd6995fae9261c3b90516d7e93b78ef0.tar.lz
cuberite-4235feb7fd6995fae9261c3b90516d7e93b78ef0.tar.xz
cuberite-4235feb7fd6995fae9261c3b90516d7e93b78ef0.tar.zst
cuberite-4235feb7fd6995fae9261c3b90516d7e93b78ef0.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/FinishGen.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 59af0fd63..513c2bd49 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -322,6 +322,7 @@ void cFinishGenTallGrass::GenFinish(cChunkDesc & a_ChunkDesc)
if (
(a_ChunkDesc.GetBlockType(x, y, z) != E_BLOCK_AIR) ||
((a_ChunkDesc.GetBlockType(x, y - 1, z) != E_BLOCK_GRASS) && (a_ChunkDesc.GetBlockType(x, y - 1, z) != E_BLOCK_DIRT))
+
)
{
continue;
@@ -337,7 +338,7 @@ void cFinishGenTallGrass::GenFinish(cChunkDesc & a_ChunkDesc)
{
a_ChunkDesc.SetBlockTypeMeta(x, y, z, E_BLOCK_TALL_GRASS, 2);
}
- else
+ else if (!IsBiomeVeryCold(a_ChunkDesc.GetBiome(x, z)))
{
// If double long grass we have to choose what type we should use:
if (a_ChunkDesc.GetBlockType(x, y + 1, z) == E_BLOCK_AIR)
@@ -347,6 +348,11 @@ void cFinishGenTallGrass::GenFinish(cChunkDesc & a_ChunkDesc)
a_ChunkDesc.SetBlockTypeMeta(x, y + 1, z, E_BLOCK_BIG_FLOWER, 8);
}
}
+ else
+ {
+ NIBBLETYPE meta = (m_Noise.IntNoise2DInt(xx * 50, zz * 50) / 7 % 2) + 1;
+ a_ChunkDesc.SetBlockTypeMeta(x, y, z, E_BLOCK_TALL_GRASS, meta);
+ }
}
}
}