summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockDeadBush.h
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-09-05 16:56:31 +0200
committerTycho <work.tycho+git@gmail.com>2014-09-05 16:56:31 +0200
commit28f66efe307150558f4ad2546e058370a828be3e (patch)
tree2ef088aa2d1a8ae85007b34b463d5044847bf006 /src/Blocks/BlockDeadBush.h
parentMerge branch 'master' into ComponentRewrite (diff)
downloadcuberite-28f66efe307150558f4ad2546e058370a828be3e.tar
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.gz
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.bz2
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.lz
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.xz
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.zst
cuberite-28f66efe307150558f4ad2546e058370a828be3e.zip
Diffstat (limited to 'src/Blocks/BlockDeadBush.h')
-rw-r--r--src/Blocks/BlockDeadBush.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Blocks/BlockDeadBush.h b/src/Blocks/BlockDeadBush.h
index 198a49948..5b687c710 100644
--- a/src/Blocks/BlockDeadBush.h
+++ b/src/Blocks/BlockDeadBush.h
@@ -17,13 +17,13 @@ public:
}
- virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/
+ 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*/
+ 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);
}