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/BlockHopper.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 '')
| -rw-r--r-- | src/Blocks/BlockHopper.h | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/Blocks/BlockHopper.h b/src/Blocks/BlockHopper.h index d855ed0a4..da2f7c6e1 100644 --- a/src/Blocks/BlockHopper.h +++ b/src/Blocks/BlockHopper.h @@ -3,19 +3,26 @@ // Declares the cBlockHopperHandler class representing the handler for the Hopper block -#include "MetaRotator.h" +#include "Mixins.h" class cBlockHopperHandler : - public cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04> + public cMetaRotator<cContainerEntityHandler<cBlockEntityHandler>, 0x07, 0x02, 0x05, 0x03, 0x04> { + using super = cMetaRotator<cContainerEntityHandler<cBlockEntityHandler>, 0x07, 0x02, 0x05, 0x03, 0x04>; + public: - cBlockHopperHandler(BLOCKTYPE a_BlockType) - : cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType) + + cBlockHopperHandler(BLOCKTYPE a_BlockType): + super(a_BlockType) { } + + + + virtual bool GetPlacementBlockTypeMeta( cChunkInterface & a_ChunkInterface, cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, @@ -39,6 +46,10 @@ public: return true; } + + + + virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) override { // Bit 0x08 is a flag. Lowest three bits are position. 0x08 == 1000 @@ -53,11 +64,9 @@ public: return a_Meta; } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override - { - // Reset meta to 0 - a_Pickups.push_back(cItem(m_BlockType, 1, 0)); - } + + + virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override { |