summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-15 13:18:14 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-15 13:18:14 +0200
commit411f0b5fa415565cb9625f61730ec94c08f7d530 (patch)
treecb74bf20077cbf58dca1700e945788d59b0b1cbc /source
parentRemoved torch top placement prevention (diff)
downloadcuberite-411f0b5fa415565cb9625f61730ec94c08f7d530.tar
cuberite-411f0b5fa415565cb9625f61730ec94c08f7d530.tar.gz
cuberite-411f0b5fa415565cb9625f61730ec94c08f7d530.tar.bz2
cuberite-411f0b5fa415565cb9625f61730ec94c08f7d530.tar.lz
cuberite-411f0b5fa415565cb9625f61730ec94c08f7d530.tar.xz
cuberite-411f0b5fa415565cb9625f61730ec94c08f7d530.tar.zst
cuberite-411f0b5fa415565cb9625f61730ec94c08f7d530.zip
Diffstat (limited to 'source')
-rw-r--r--source/Blocks/BlockHandler.cpp9
-rw-r--r--source/Blocks/BlockHandler.h5
-rw-r--r--source/ClientHandle.cpp9
3 files changed, 1 insertions, 22 deletions
diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp
index 5134c1103..6d5394a9b 100644
--- a/source/Blocks/BlockHandler.cpp
+++ b/source/Blocks/BlockHandler.cpp
@@ -404,15 +404,6 @@ bool cBlockHandler::DoesIgnoreBuildCollision(void)
-bool cBlockHandler::DoesAllowBlockOnTop(void)
-{
- return true;
-}
-
-
-
-
-
bool cBlockHandler::CanBePlacedOnSide(void)
{
return true;
diff --git a/source/Blocks/BlockHandler.h b/source/Blocks/BlockHandler.h
index 228ce174b..c1df7e934 100644
--- a/source/Blocks/BlockHandler.h
+++ b/source/Blocks/BlockHandler.h
@@ -83,10 +83,7 @@ public:
NOTE: This call doesn't actually place the block
*/
// virtual bool CanBePlacedAt(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir);
-
- /// Called when the player tries to place a block on top of this block (Only if he aims directly on this block); return false to disallow
- virtual bool DoesAllowBlockOnTop(void);
-
+
/// Called to check whether this block supports a rclk action. If it returns true, OnUse() is called
virtual bool IsUseable(void);
diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index 3d819ee18..f915fd7ae 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -908,15 +908,6 @@ void cClientHandle::HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, c
}
else
{
- // Check for Blocks not allowing placement on top
- if ((a_BlockFace == BLOCK_FACE_TOP) && !Handler->DoesAllowBlockOnTop())
- {
- // Resend the old block
- // Sometimes the client still places the block O.o
- World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player);
- return;
- }
-
if (!BlockHandler(PlaceBlock)->DoesIgnoreBuildCollision())
{
// Tried to place a block *into* another?