diff options
| author | STRWarrior <niels.breuker@hotmail.nl> | 2014-02-03 20:22:45 +0100 |
|---|---|---|
| committer | STRWarrior <niels.breuker@hotmail.nl> | 2014-02-03 20:22:45 +0100 |
| commit | 0c29c52ff3713047fe280bdc07d7a2f09e9a32e8 (patch) | |
| tree | c236f09e9e329d4a500c43d5e5438d98e923e102 | |
| parent | This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars. (diff) | |
| download | cuberite-0c29c52ff3713047fe280bdc07d7a2f09e9a32e8.tar cuberite-0c29c52ff3713047fe280bdc07d7a2f09e9a32e8.tar.gz cuberite-0c29c52ff3713047fe280bdc07d7a2f09e9a32e8.tar.bz2 cuberite-0c29c52ff3713047fe280bdc07d7a2f09e9a32e8.tar.lz cuberite-0c29c52ff3713047fe280bdc07d7a2f09e9a32e8.tar.xz cuberite-0c29c52ff3713047fe280bdc07d7a2f09e9a32e8.tar.zst cuberite-0c29c52ff3713047fe280bdc07d7a2f09e9a32e8.zip | |
| -rw-r--r-- | src/Blocks/BlockHandler.cpp | 2 | ||||
| -rw-r--r-- | src/Blocks/BlockQuartz.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp index 3ecf0d7e2..657058e3e 100644 --- a/src/Blocks/BlockHandler.cpp +++ b/src/Blocks/BlockHandler.cpp @@ -176,7 +176,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType) case E_BLOCK_POWERED_RAIL: return new cBlockRailHandler (a_BlockType); case E_BLOCK_PUMPKIN: return new cBlockPumpkinHandler (a_BlockType); case E_BLOCK_PUMPKIN_STEM: return new cBlockStemsHandler (a_BlockType); - case E_BLOCK_QUARTZ_BLOCK: return new cBlockQuartsHandler (a_BlockType); + case E_BLOCK_QUARTZ_BLOCK: return new cBlockQuartzHandler (a_BlockType); case E_BLOCK_QUARTZ_STAIRS: return new cBlockStairsHandler (a_BlockType); case E_BLOCK_RAIL: return new cBlockRailHandler (a_BlockType); case E_BLOCK_REDSTONE_LAMP_ON: return new cBlockRedstoneLampHandler (a_BlockType); // We need this to change pickups to an off lamp; else 1.7+ clients crash diff --git a/src/Blocks/BlockQuartz.h b/src/Blocks/BlockQuartz.h index a01abac7b..e5306ff6a 100644 --- a/src/Blocks/BlockQuartz.h +++ b/src/Blocks/BlockQuartz.h @@ -7,10 +7,10 @@ -class cBlockQuartsHandler : public cBlockHandler +class cBlockQuartzHandler : public cBlockHandler { public: - cBlockQuartsHandler(BLOCKTYPE a_BlockType) + cBlockQuartzHandler(BLOCKTYPE a_BlockType) : cBlockHandler(a_BlockType) { } @@ -27,7 +27,7 @@ public: NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage); if (Meta != 0x2) // Check if the block is a pillar block. { - return false; + return true; } a_BlockMeta = BlockFaceToMetaData(a_BlockFace, Meta); |