flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Refactored block-to-pickup conversion. (#4417)

Browse Source
This commit is contained in:
Mattes D
2019-10-16 10:06:34 +02:00
committed by GitHub
parent 241d97bbf9
commit 221cc4ec5c
121 changed files with 2496 additions and 1744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Blocks/BlockConcretePowder.h
+14 -7
View File
@@ -10,9 +10,12 @@
class cBlockConcretePowderHandler :
public cBlockHandler
{
using super = cBlockHandler;
public:
cBlockConcretePowderHandler(BLOCKTYPE a_BlockType):
cBlockHandler(a_BlockType)
super(a_BlockType)
{
}
@@ -20,21 +23,25 @@ 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);
}
/** Check blocks above and around to see if they are water. If one is, convert this into concrete block.
Returns TRUE if the block was changed. */
/** Check blocks above and around to see if they are water. If one is, converts this into concrete block.
Returns true if the block was changed. */
bool GetSoaked(Vector3i a_Rel, cChunk & a_Chunk)
{
static const std::array<Vector3i, 5> WaterCheck
@@ -62,7 +69,7 @@ public:
{
NIBBLETYPE BlockMeta;
BlockMeta = a_Chunk.GetMeta(a_Rel.x, a_Rel.y, a_Rel.z);
a_Chunk.SetBlock(a_Rel.x, a_Rel.y, a_Rel.z, E_BLOCK_CONCRETE, BlockMeta);
a_Chunk.SetBlock(a_Rel, E_BLOCK_CONCRETE, BlockMeta);
return true;
}
return false;