flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Removed leftover DoesAllowBlockOnTop

Browse Source
This commit is contained in:
Tiger Wang 2013-09-15 12:18:14 +01:00
parent 4cdf776759
commit 411f0b5fa4
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/Blocks/BlockHandler.cpp
View File

@ -404,15 +404,6 @@ bool cBlockHandler::DoesIgnoreBuildCollision(void)
bool cBlockHandler::DoesAllowBlockOnTop(void)
{
return true;
}
bool cBlockHandler::CanBePlacedOnSide(void) bool cBlockHandler::CanBePlacedOnSide(void)
{ {
return true; return true;

5
source/Blocks/BlockHandler.h
View File

@ -83,10 +83,7 @@ public:
NOTE: This call doesn't actually place the block 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); // 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 /// Called to check whether this block supports a rclk action. If it returns true, OnUse() is called
virtual bool IsUseable(void); virtual bool IsUseable(void);

9
source/ClientHandle.cpp
View File

@ -908,15 +908,6 @@ void cClientHandle::HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, c
} }
else 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()) if (!BlockHandler(PlaceBlock)->DoesIgnoreBuildCollision())
{ {
// Tried to place a block *into* another? // Tried to place a block *into* another?