From 350c801b41e09b7a1edc772e91ef484b2ca958bc Mon Sep 17 00:00:00 2001 From: Rodarg Date: Tue, 8 Feb 2022 16:00:05 +0100 Subject: Update BlockBigFlower.h Made compliant with review --- src/Blocks/BlockBigFlower.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Blocks/BlockBigFlower.h b/src/Blocks/BlockBigFlower.h index fa15c3aa6..c6612032f 100644 --- a/src/Blocks/BlockBigFlower.h +++ b/src/Blocks/BlockBigFlower.h @@ -49,6 +49,10 @@ private: virtual cItems ConvertToPickups(const NIBBLETYPE a_BlockMeta, const cItem * const a_Tool) const override { + if (IsMetaTopPart(a_BlockMeta)) + { + return {}; + } // With shears, drop self (even tall grass and fern): if ((a_Tool != nullptr) && (a_Tool->m_ItemType == E_ITEM_SHEARS)) @@ -121,7 +125,11 @@ private: auto lowerPartPos = a_BlockPos - Vector3i(0, 1, 0); if (a_ChunkInterface.GetBlock(lowerPartPos) == a_OldBlockType) { - a_ChunkInterface.SetBlock(lowerPartPos, E_BLOCK_AIR, 0); + if (a_Digger->IsPlayer() && (static_cast(a_Digger))->IsGameModeCreative()) { + a_ChunkInterface.SetBlock(lowerPartPos, E_BLOCK_AIR, 0); + } else { + a_ChunkInterface.DropBlockAsPickups(lowerPartPos); + } } } else -- cgit v1.2.3