diff options
| author | Mattes D <github@xoft.cz> | 2014-10-23 08:40:39 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-10-23 08:40:39 +0200 |
| commit | f8c54f4243049abbcafff1e96f994f742ea9f50d (patch) | |
| tree | 67fe10bfea90cbb21952039bd795666682d43ad5 /src/Blocks/BlockDeadBush.h | |
| parent | Compile fix? (diff) | |
| parent | Merge pull request #1559 from mc-server/nullptr (diff) | |
| download | cuberite-f8c54f4243049abbcafff1e96f994f742ea9f50d.tar cuberite-f8c54f4243049abbcafff1e96f994f742ea9f50d.tar.gz cuberite-f8c54f4243049abbcafff1e96f994f742ea9f50d.tar.bz2 cuberite-f8c54f4243049abbcafff1e96f994f742ea9f50d.tar.lz cuberite-f8c54f4243049abbcafff1e96f994f742ea9f50d.tar.xz cuberite-f8c54f4243049abbcafff1e96f994f742ea9f50d.tar.zst cuberite-f8c54f4243049abbcafff1e96f994f742ea9f50d.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Blocks/BlockDeadBush.h | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/Blocks/BlockDeadBush.h b/src/Blocks/BlockDeadBush.h index 5b687c710..09df16893 100644 --- a/src/Blocks/BlockDeadBush.h +++ b/src/Blocks/BlockDeadBush.h @@ -17,15 +17,25 @@ public: } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override - { - // Don't drop anything - } - - virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override { - return (a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) == E_BLOCK_SAND); + if (a_RelY <= 0) + { + return false; + } + + BLOCKTYPE BelowBlock = a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ); + switch (BelowBlock) + { + case E_BLOCK_CLAY: + case E_BLOCK_HARDENED_CLAY: + case E_BLOCK_STAINED_CLAY: + case E_BLOCK_SAND: + { + return true; + } + default: return false; + } } } ; |