diff options
Diffstat (limited to 'src/Blocks/BlockSapling.h')
| -rw-r--r-- | src/Blocks/BlockSapling.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/Blocks/BlockSapling.h b/src/Blocks/BlockSapling.h index 1770cc4aa..b7d2f163b 100644 --- a/src/Blocks/BlockSapling.h +++ b/src/Blocks/BlockSapling.h @@ -17,18 +17,18 @@ public: : cBlockHandler(a_BlockType) { } - + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { // Only the first 2 bits contain the display information and the 4th bit is for the growth indicator, but, we use 0x07 for forward compatibility a_Pickups.push_back(cItem(E_BLOCK_SAPLING, 1, a_BlockMeta & 0x07)); } - + virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override { return (a_RelY > 0) && IsBlockTypeOfDirt(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ)); } - + virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override { NIBBLETYPE Meta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ); @@ -92,7 +92,18 @@ public: } break; } - // Dark Oaks only grow in a 2x2 area + // Acacias don't need horizontal clearance + case E_META_SAPLING_ACACIA: + { + if (!IsLargeTree(a_Chunk, a_RelX, a_RelY, a_RelZ, a_Meta)) + { + return false; + } + CheckHeight = 7; + LargeTree = true; + break; + } + // Dark Oaks don't need horizontal clearance case E_META_SAPLING_DARK_OAK: { if (!IsLargeTree(a_Chunk, a_RelX, a_RelY, a_RelZ, a_Meta)) |