diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-09-15 13:20:13 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-09-15 13:20:13 +0200 |
commit | a8cb2bd90e07ad6be815fc456638d2699463d68f (patch) | |
tree | 79adca9fdae8f3c25c43c112c729da52ee6d0002 /source | |
parent | Removed leftover DoesAllowBlockOnTop (diff) | |
download | cuberite-a8cb2bd90e07ad6be815fc456638d2699463d68f.tar cuberite-a8cb2bd90e07ad6be815fc456638d2699463d68f.tar.gz cuberite-a8cb2bd90e07ad6be815fc456638d2699463d68f.tar.bz2 cuberite-a8cb2bd90e07ad6be815fc456638d2699463d68f.tar.lz cuberite-a8cb2bd90e07ad6be815fc456638d2699463d68f.tar.xz cuberite-a8cb2bd90e07ad6be815fc456638d2699463d68f.tar.zst cuberite-a8cb2bd90e07ad6be815fc456638d2699463d68f.zip |
Diffstat (limited to 'source')
-rw-r--r-- | source/Blocks/BlockHandler.cpp | 9 | ||||
-rw-r--r-- | source/Blocks/BlockHandler.h | 3 | ||||
-rw-r--r-- | source/ClientHandle.cpp | 7 |
3 files changed, 0 insertions, 19 deletions
diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp index 6d5394a9b..4aaf47306 100644 --- a/source/Blocks/BlockHandler.cpp +++ b/source/Blocks/BlockHandler.cpp @@ -404,15 +404,6 @@ bool cBlockHandler::DoesIgnoreBuildCollision(void) -bool cBlockHandler::CanBePlacedOnSide(void) -{ - return true; -} - - - - - bool cBlockHandler::DoesDropOnUnsuitable(void) { return true; diff --git a/source/Blocks/BlockHandler.h b/source/Blocks/BlockHandler.h index c1df7e934..0487505ee 100644 --- a/source/Blocks/BlockHandler.h +++ b/source/Blocks/BlockHandler.h @@ -96,9 +96,6 @@ public: For example blocks placed "on" snow will be placed at the same position. So: Snow ignores Build collision */ virtual bool DoesIgnoreBuildCollision(void); - - /// Indicates this block can be placed on the side of other blocks. Default: true - virtual bool CanBePlacedOnSide(void); /// Does this block drop if it gets destroyed by an unsuitable situation? Default: true virtual bool DoesDropOnUnsuitable(void); diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp index f915fd7ae..b0f18a4c0 100644 --- a/source/ClientHandle.cpp +++ b/source/ClientHandle.cpp @@ -929,13 +929,6 @@ void cClientHandle::HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, c cBlockHandler * NewBlock = BlockHandler(BlockType); - if ((a_BlockFace != BLOCK_FACE_TOP) && !NewBlock->CanBePlacedOnSide()) - { - // Cannot be placed on the side of an other block - World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player); - return; - } - if (cRoot::Get()->GetPluginManager()->CallHookPlayerPlacingBlock(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, BlockType, BlockMeta)) { // A plugin doesn't agree with placing the block, revert the block on the client: |