summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockDeadBush.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-21 22:04:51 +0200
committerMattes D <github@xoft.cz>2014-10-21 22:04:51 +0200
commit814e4404bb428a0d825f12e513562d4e43e9e6dc (patch)
tree6916feb703428abc5d4788db2c67c47e9da10905 /src/Blocks/BlockDeadBush.h
parentProperly exported cItemFrame and cHangingEntity to Lua. (diff)
parentReverted hook move. (diff)
downloadcuberite-814e4404bb428a0d825f12e513562d4e43e9e6dc.tar
cuberite-814e4404bb428a0d825f12e513562d4e43e9e6dc.tar.gz
cuberite-814e4404bb428a0d825f12e513562d4e43e9e6dc.tar.bz2
cuberite-814e4404bb428a0d825f12e513562d4e43e9e6dc.tar.lz
cuberite-814e4404bb428a0d825f12e513562d4e43e9e6dc.tar.xz
cuberite-814e4404bb428a0d825f12e513562d4e43e9e6dc.tar.zst
cuberite-814e4404bb428a0d825f12e513562d4e43e9e6dc.zip
Diffstat (limited to 'src/Blocks/BlockDeadBush.h')
-rw-r--r--src/Blocks/BlockDeadBush.h24
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;
+ }
}
} ;