From 221cc4ec5cb6301743e947eaabed3fecedba796f Mon Sep 17 00:00:00 2001 From: Mattes D Date: Wed, 16 Oct 2019 10:06:34 +0200 Subject: Refactored block-to-pickup conversion. (#4417) --- src/Blocks/BlockSponge.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/Blocks/BlockSponge.h') diff --git a/src/Blocks/BlockSponge.h b/src/Blocks/BlockSponge.h index 24bc25388..7df5d69ff 100644 --- a/src/Blocks/BlockSponge.h +++ b/src/Blocks/BlockSponge.h @@ -10,9 +10,12 @@ class cBlockSpongeHandler : public cBlockHandler { + using super = cBlockHandler; + public: + cBlockSpongeHandler(BLOCKTYPE a_BlockType): - cBlockHandler(a_BlockType) + super(a_BlockType) { } @@ -20,13 +23,17 @@ public: - virtual void Check(cChunkInterface & a_ChunkInterface, cBlockPluginInterface & a_PluginInterface, int a_RelX, int a_RelY, int a_RelZ, cChunk & a_Chunk) override + virtual void Check( + cChunkInterface & a_ChunkInterface, cBlockPluginInterface & a_PluginInterface, + Vector3i a_RelPos, + cChunk & a_Chunk + ) override { - if (GetSoaked(Vector3i(a_RelX, a_RelY, a_RelZ), a_Chunk)) + if (GetSoaked(a_RelPos, a_Chunk)) { return; } - cBlockHandler::Check(a_ChunkInterface, a_PluginInterface, a_RelX, a_RelY, a_RelZ, a_Chunk); + super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk); } @@ -115,7 +122,7 @@ public: } Seeds.pop(); } - a_Chunk.SetBlock(a_Rel.x, a_Rel.y, a_Rel.z, E_BLOCK_SPONGE, E_META_SPONGE_WET); + a_Chunk.SetBlock(a_Rel, E_BLOCK_SPONGE, E_META_SPONGE_WET); return true; } -- cgit v1.2.3