summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-06-19 18:11:24 +0200
committerLukas Pioch <lukas@zgow.de>2017-06-19 20:18:44 +0200
commit9201c7be7a77a77cf0f8f2c1cf5019d8969393c8 (patch)
tree53faea46596c8e438de1a8051c5d8e0e642c491c
parentMSVC Debug builds: Added operator new redirection to provide more info. (#3781) (diff)
downloadcuberite-9201c7be7a77a77cf0f8f2c1cf5019d8969393c8.tar
cuberite-9201c7be7a77a77cf0f8f2c1cf5019d8969393c8.tar.gz
cuberite-9201c7be7a77a77cf0f8f2c1cf5019d8969393c8.tar.bz2
cuberite-9201c7be7a77a77cf0f8f2c1cf5019d8969393c8.tar.lz
cuberite-9201c7be7a77a77cf0f8f2c1cf5019d8969393c8.tar.xz
cuberite-9201c7be7a77a77cf0f8f2c1cf5019d8969393c8.tar.zst
cuberite-9201c7be7a77a77cf0f8f2c1cf5019d8969393c8.zip
-rw-r--r--src/Blocks/BlockBigFlower.h5
-rw-r--r--src/Chunk.cpp2
-rw-r--r--src/Generating/FinishGen.cpp4
3 files changed, 7 insertions, 4 deletions
diff --git a/src/Blocks/BlockBigFlower.h b/src/Blocks/BlockBigFlower.h
index b25d65258..3b3065f87 100644
--- a/src/Blocks/BlockBigFlower.h
+++ b/src/Blocks/BlockBigFlower.h
@@ -49,7 +49,10 @@ public:
NIBBLETYPE Meta = a_BlockMeta & 0x7;
if (Meta == E_META_BIG_FLOWER_DOUBLE_TALL_GRASS)
{
- a_Pickups.push_back(cItem(E_ITEM_SEEDS));
+ if (GetRandomProvider().RandBool(1.0 / 24.0))
+ {
+ a_Pickups.push_back(cItem(E_ITEM_SEEDS));
+ }
}
else if (Meta != E_META_BIG_FLOWER_LARGE_FERN)
{
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index b6576486c..849b0e2f5 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -1139,7 +1139,7 @@ bool cChunk::GrowTallGrass(int a_RelX, int a_RelY, int a_RelZ)
default: return false;
}
return UnboundedRelFastSetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_BIG_FLOWER, LargeFlowerMeta) &&
- UnboundedRelFastSetBlock(a_RelX, a_RelY + 1, a_RelZ, E_BLOCK_BIG_FLOWER, 8);
+ UnboundedRelFastSetBlock(a_RelX, a_RelY + 1, a_RelZ, E_BLOCK_BIG_FLOWER, 0x8 | LargeFlowerMeta);
}
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 81ed63924..df8d0929d 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -260,7 +260,7 @@ void cFinishGenClumpTopBlock::TryPlaceFoliageClump(cChunkDesc & a_ChunkDesc, int
a_ChunkDesc.SetBlockTypeMeta(x, Top + 1, z, a_BlockType, a_BlockMeta);
if (a_IsDoubleTall)
{
- a_ChunkDesc.SetBlockTypeMeta(x, Top + 2, z, E_BLOCK_BIG_FLOWER, 8);
+ a_ChunkDesc.SetBlockTypeMeta(x, Top + 2, z, E_BLOCK_BIG_FLOWER, 0x8 | a_BlockMeta);
a_ChunkDesc.SetHeight(x, z, static_cast<HEIGHTTYPE>(Top + 2));
}
else
@@ -554,7 +554,7 @@ void cFinishGenTallGrass::GenFinish(cChunkDesc & a_ChunkDesc)
{
NIBBLETYPE Meta = (m_Noise.IntNoise2DInt(xx * 100, zz * 100) / 7 % 100) > 25 ? 2 : 3;
a_ChunkDesc.SetBlockTypeMeta(x, y, z, E_BLOCK_BIG_FLOWER, Meta);
- a_ChunkDesc.SetBlockTypeMeta(x, y + 1, z, E_BLOCK_BIG_FLOWER, 8);
+ a_ChunkDesc.SetBlockTypeMeta(x, y + 1, z, E_BLOCK_BIG_FLOWER, 0x8 | Meta);
a_ChunkDesc.SetHeight(x, z, static_cast<HEIGHTTYPE>(y + 1));
}
}