summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJulian Laubstein <julianlaubstein@yahoo.de>2015-07-15 19:31:41 +0200
committerJulian Laubstein <julianlaubstein@yahoo.de>2015-07-15 19:31:41 +0200
commit01f90ef97d7dc19f54393868fb6627afa38a957f (patch)
tree81cb8136e08a61f6a903009543c4c2985fefac98 /src
parentMerge pull request #2349 from cuberite/maps (diff)
parentFixed tall grass trying to be placed in cold biomes. (diff)
downloadcuberite-01f90ef97d7dc19f54393868fb6627afa38a957f.tar
cuberite-01f90ef97d7dc19f54393868fb6627afa38a957f.tar.gz
cuberite-01f90ef97d7dc19f54393868fb6627afa38a957f.tar.bz2
cuberite-01f90ef97d7dc19f54393868fb6627afa38a957f.tar.lz
cuberite-01f90ef97d7dc19f54393868fb6627afa38a957f.tar.xz
cuberite-01f90ef97d7dc19f54393868fb6627afa38a957f.tar.zst
cuberite-01f90ef97d7dc19f54393868fb6627afa38a957f.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);
+ }
}
}
}