diff options
author | Alexander Harkness <me@bearbin.net> | 2020-04-08 22:35:08 +0200 |
---|---|---|
committer | Alexander Harkness <me@bearbin.net> | 2020-04-10 15:07:16 +0200 |
commit | f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6 (patch) | |
tree | d96f25621ab462bf3af7ff7403acb54c01a70595 /src/Blocks/BlockHopper.h | |
parent | Brewing stands do not have rotation (diff) | |
download | cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.gz cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.bz2 cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.lz cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.xz cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.zst cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Blocks/BlockHopper.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/Blocks/BlockHopper.h b/src/Blocks/BlockHopper.h index da2f7c6e1..0c6724d76 100644 --- a/src/Blocks/BlockHopper.h +++ b/src/Blocks/BlockHopper.h @@ -8,9 +8,9 @@ class cBlockHopperHandler : - public cMetaRotator<cContainerEntityHandler<cBlockEntityHandler>, 0x07, 0x02, 0x05, 0x03, 0x04> + public cPitchYawRotator<cContainerEntityHandler<cBlockEntityHandler>> { - using super = cMetaRotator<cContainerEntityHandler<cBlockEntityHandler>, 0x07, 0x02, 0x05, 0x03, 0x04>; + using super = cPitchYawRotator<cContainerEntityHandler<cBlockEntityHandler>>; public: @@ -50,24 +50,6 @@ public: - virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) override - { - // Bit 0x08 is a flag. Lowest three bits are position. 0x08 == 1000 - NIBBLETYPE OtherMeta = a_Meta & 0x08; - // Mirrors defined by by a table. (Source, mincraft.gamepedia.com) 0x07 == 0111 - switch (a_Meta & 0x07) - { - case 0x00: return 0x01 + OtherMeta; // Down -> Up - case 0x01: return 0x00 + OtherMeta; // Up -> Down - } - // Not Facing Up or Down; No change. - return a_Meta; - } - - - - - virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override { UNUSED(a_Meta); |