diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-06-30 16:50:15 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-07-14 22:46:30 +0200 |
| commit | 8656e149c8820272a882406912790f0075ed5f28 (patch) | |
| tree | b4f89f69dfb026f76862046637fd99162a49d3c9 /src/Blocks/BlockSnow.h | |
| parent | Merge pull request #2352 from mmdk95/master (diff) | |
| download | cuberite-8656e149c8820272a882406912790f0075ed5f28.tar cuberite-8656e149c8820272a882406912790f0075ed5f28.tar.gz cuberite-8656e149c8820272a882406912790f0075ed5f28.tar.bz2 cuberite-8656e149c8820272a882406912790f0075ed5f28.tar.lz cuberite-8656e149c8820272a882406912790f0075ed5f28.tar.xz cuberite-8656e149c8820272a882406912790f0075ed5f28.tar.zst cuberite-8656e149c8820272a882406912790f0075ed5f28.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Blocks/BlockSnow.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Blocks/BlockSnow.h b/src/Blocks/BlockSnow.h index 7b6094c9f..3fab0b8ef 100644 --- a/src/Blocks/BlockSnow.h +++ b/src/Blocks/BlockSnow.h @@ -16,7 +16,6 @@ public: { } - virtual bool GetPlacementBlockTypeMeta( cChunkInterface & a_ChunkInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, @@ -42,7 +41,6 @@ public: return true; } - virtual bool DoesIgnoreBuildCollision(cPlayer * a_Player, NIBBLETYPE a_Meta) override { if ((a_Player->GetEquippedItem().m_ItemType == E_BLOCK_SNOW) && (a_Meta < 7)) @@ -57,14 +55,12 @@ public: return false; } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { a_Pickups.push_back(cItem(E_ITEM_SNOWBALL, 1, 0)); } - virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override { if (a_RelY > 0) @@ -82,11 +78,16 @@ public: return false; } - virtual bool DoesDropOnUnsuitable(void) override { return false; } + + virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override + { + UNUSED(a_Meta); + return 14; + } } ; |