diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-11-29 23:25:07 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-11-29 23:25:07 +0100 |
| commit | cee5160be879434fd59567c5b2d80af10c163276 (patch) | |
| tree | 3a8b5ea7ebeb10aa656226df77dc562ae2b4ea05 /src/Blocks/BlockRedstoneRepeater.h | |
| parent | Merge pull request #362 from mc-server/redstonefixes (diff) | |
| download | cuberite-cee5160be879434fd59567c5b2d80af10c163276.tar cuberite-cee5160be879434fd59567c5b2d80af10c163276.tar.gz cuberite-cee5160be879434fd59567c5b2d80af10c163276.tar.bz2 cuberite-cee5160be879434fd59567c5b2d80af10c163276.tar.lz cuberite-cee5160be879434fd59567c5b2d80af10c163276.tar.xz cuberite-cee5160be879434fd59567c5b2d80af10c163276.tar.zst cuberite-cee5160be879434fd59567c5b2d80af10c163276.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Blocks/BlockRedstoneRepeater.h | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/src/Blocks/BlockRedstoneRepeater.h b/src/Blocks/BlockRedstoneRepeater.h index a61121d3a..1fcddd4f8 100644 --- a/src/Blocks/BlockRedstoneRepeater.h +++ b/src/Blocks/BlockRedstoneRepeater.h @@ -11,10 +11,29 @@ class cBlockRedstoneRepeaterHandler : public cBlockHandler { public: - cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockType); - virtual void OnDestroyed(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override; + cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockType) + : cBlockHandler(a_BlockType) + { + } + + + virtual bool GetPlacementBlockTypeMeta( + cWorld * a_World, cPlayer * a_Player, + int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, + int a_CursorX, int a_CursorY, int a_CursorZ, + BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta + ) override + { + a_BlockType = m_BlockType; + a_BlockMeta = RepeaterRotationToMetaData(a_Player->GetRotation()); + return true; + } - virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override; + + virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override + { + a_World->SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) + 0x04) & 0x0f)); + } virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override @@ -34,14 +53,6 @@ public: { return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR)); } - - - virtual bool GetPlacementBlockTypeMeta( - cWorld * a_World, cPlayer * a_Player, - int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, - int a_CursorX, int a_CursorY, int a_CursorZ, - BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override; virtual const char * GetStepSound(void) override |