diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2020-09-20 15:50:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-20 15:50:52 +0200 |
| commit | 68cced73afe546328cf94ed07c57deee47bfadec (patch) | |
| tree | 88be88e3fd4a208b9849e526f1877caa44058ab5 /src/Blocks/BlockIce.h | |
| parent | Added armor and shulker box cleaning (#4875) (diff) | |
| download | cuberite-68cced73afe546328cf94ed07c57deee47bfadec.tar cuberite-68cced73afe546328cf94ed07c57deee47bfadec.tar.gz cuberite-68cced73afe546328cf94ed07c57deee47bfadec.tar.bz2 cuberite-68cced73afe546328cf94ed07c57deee47bfadec.tar.lz cuberite-68cced73afe546328cf94ed07c57deee47bfadec.tar.xz cuberite-68cced73afe546328cf94ed07c57deee47bfadec.tar.zst cuberite-68cced73afe546328cf94ed07c57deee47bfadec.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Blocks/BlockIce.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Blocks/BlockIce.h b/src/Blocks/BlockIce.h index a4372d0ea..e20ce6daa 100644 --- a/src/Blocks/BlockIce.h +++ b/src/Blocks/BlockIce.h @@ -14,12 +14,11 @@ class cBlockIceHandler : public: - cBlockIceHandler(BLOCKTYPE a_BlockType): - Super(a_BlockType) - { - } + using Super::Super; + +private: - virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override + virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) const override { // Only drop self when using silk-touch: if (ToolHasSilkTouch(a_Tool)) @@ -36,7 +35,7 @@ public: cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, Vector3i a_BlockPos, BLOCKTYPE a_OldBlockType, NIBBLETYPE a_OldBlockMeta - ) override + ) const override { // If there's a solid block or a liquid underneath, convert to water, rather than air if (a_BlockPos.y <= 0) @@ -51,7 +50,7 @@ public: } } - virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override + virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override { UNUSED(a_Meta); return 5; |