From f9b56dd859b97dd9af5f2a0c7050270d7a44b525 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Tue, 18 Jul 2017 15:14:52 +0200 Subject: Break the cactus block when it grows next to a block. (#3851) --- src/Blocks/BlockCactus.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Blocks/BlockCactus.h') diff --git a/src/Blocks/BlockCactus.h b/src/Blocks/BlockCactus.h index 29e86d085..371402423 100644 --- a/src/Blocks/BlockCactus.h +++ b/src/Blocks/BlockCactus.h @@ -36,7 +36,7 @@ public: return false; } - // Check surroundings. Cacti may ONLY be surrounded by air + // Check surroundings. Cacti may ONLY be surrounded by non-solid blocks static const struct { int x, z; @@ -53,7 +53,11 @@ public: NIBBLETYPE BlockMeta; if ( a_Chunk.UnboundedRelGetBlock(a_RelX + Coords[i].x, a_RelY, a_RelZ + Coords[i].z, BlockType, BlockMeta) && - cBlockInfo::IsSolid(BlockType) + ( + cBlockInfo::IsSolid(BlockType) || + (BlockType == E_BLOCK_LAVA) || + (BlockType == E_BLOCK_STATIONARY_LAVA) + ) ) { return false; -- cgit v1.2.3