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

Merge pull request #2491 from cuberite/FixLilypadPopout

Browse Source 
Lilypads drop when not on source water.
This commit is contained in:
Mattes D 2015-09-25 15:24:52 +02:00
commit 02f65168b1
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Blocks/BlockLilypad.h
View File

@ -23,6 +23,22 @@ public:
UNUSED(a_Meta);
return 7;
}
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
{
if ((a_RelY < 1) || (a_RelY >= cChunkDef::Height))
{
return false;
}
BLOCKTYPE UnderType;
NIBBLETYPE UnderMeta;
a_Chunk.GetBlockTypeMeta(a_RelX, a_RelY - 1, a_RelZ, UnderType, UnderMeta);
return (
((UnderType == E_BLOCK_STATIONARY_WATER) || (UnderType == E_BLOCK_WATER)) && // Water is below...
(UnderMeta == 0) // ... and it's a source
);
}
};