diff options
Diffstat (limited to 'src/Blocks/BlockFarmland.h')
| -rw-r--r-- | src/Blocks/BlockFarmland.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/src/Blocks/BlockFarmland.h b/src/Blocks/BlockFarmland.h index 09982cd5e..219f9a654 100644 --- a/src/Blocks/BlockFarmland.h +++ b/src/Blocks/BlockFarmland.h @@ -17,15 +17,21 @@ class cBlockFarmlandHandler : - public cBlockHandler + public cClearMetaOnDrop<cBlockHandler> { + using super = cClearMetaOnDrop<cBlockHandler>; public: - cBlockFarmlandHandler(BLOCKTYPE a_BlockType) : - cBlockHandler(a_BlockType) + + cBlockFarmlandHandler(BLOCKTYPE a_BlockType): + super(a_BlockType) { } + + + + 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 BlockMeta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ); @@ -60,14 +66,17 @@ public: } default: { - a_Chunk.SetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_DIRT, 0); + a_Chunk.SetBlock({a_RelX, a_RelY, a_RelZ}, E_BLOCK_DIRT, 0); break; } } } - virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_WhichNeighbor) override + + + + virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, Vector3i a_BlockPos, eBlockFace a_WhichNeighbor) override { // Don't care about any neighbor but the one above us (fix recursion loop in #2213): if (a_WhichNeighbor != BLOCK_FACE_YP) @@ -76,24 +85,21 @@ public: } // Don't care about anything if we're at the top of the world: - if (a_BlockY >= cChunkDef::Height) + if (a_BlockPos.y >= cChunkDef::Height) { return; } // Check whether we should revert to dirt: - BLOCKTYPE UpperBlock = a_ChunkInterface.GetBlock({a_BlockX, a_BlockY + 1, a_BlockZ}); - if (cBlockInfo::FullyOccupiesVoxel(UpperBlock)) + auto upperBlock = a_ChunkInterface.GetBlock(a_BlockPos.addedY(1)); + if (cBlockInfo::FullyOccupiesVoxel(upperBlock)) { - a_ChunkInterface.SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_DIRT, 0); + a_ChunkInterface.SetBlock(a_BlockPos, E_BLOCK_DIRT, 0); } } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override - { - a_Pickups.Add(E_BLOCK_DIRT, 1, 0); // Reset meta - } + bool IsWaterInNear(cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) |