diff options
| author | Mattes D <github@xoft.cz> | 2019-10-16 10:06:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 10:06:34 +0200 |
| commit | 221cc4ec5cb6301743e947eaabed3fecedba796f (patch) | |
| tree | 4e44c8bb7523e5d1d04468fc906ae24674c10abc /src/Blocks/BlockTorch.h | |
| parent | Fixed crash in hopper while pulling items from blockentity above itself (#4412) (diff) | |
| download | cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar.gz cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar.bz2 cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar.lz cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar.xz cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.tar.zst cuberite-221cc4ec5cb6301743e947eaabed3fecedba796f.zip | |
Diffstat (limited to 'src/Blocks/BlockTorch.h')
| -rw-r--r-- | src/Blocks/BlockTorch.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h index 8f95fa344..c5b06b18a 100644 --- a/src/Blocks/BlockTorch.h +++ b/src/Blocks/BlockTorch.h @@ -3,17 +3,20 @@ #include "BlockHandler.h" #include "../Chunk.h" #include "ChunkInterface.h" -#include "MetaRotator.h" +#include "Mixins.h" class cBlockTorchHandler : - public cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2> + public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>> { + using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>>; + public: - cBlockTorchHandler(BLOCKTYPE a_BlockType) - : cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>(a_BlockType) + + cBlockTorchHandler(BLOCKTYPE a_BlockType): + super(a_BlockType) { } @@ -182,12 +185,6 @@ public: return CanBePlacedOn(BlockInQuestion, BlockInQuestionMeta, Face); } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override - { - // Always drop meta = 0 - a_Pickups.push_back(cItem(m_BlockType, 1, 0)); - } - virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override { UNUSED(a_Meta); |