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

Fix assert when clicking blocks at the top of the world.

Browse Source
This commit is contained in:
Mattes D 2017-06-08 19:27:24 +02:00 committed by Lukas Pioch
parent c82facab1b
commit 9c08b4524c
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ClientHandle.cpp
View File

@ -1050,12 +1050,10 @@ void cClientHandle::HandleLeftClick(int a_BlockX, int a_BlockY, int a_BlockZ, eB
int BlockZ = a_BlockZ; int BlockZ = a_BlockZ;
AddFaceDirection(BlockX, BlockY, BlockZ, a_BlockFace); AddFaceDirection(BlockX, BlockY, BlockZ, a_BlockFace);
if ((BlockY < 0) || (BlockY >= cChunkDef::Height)) if (
{ cChunkDef::IsValidHeight(BlockY) &&
return; cBlockInfo::GetHandler(m_Player->GetWorld()->GetBlock(BlockX, BlockY, BlockZ))->IsClickedThrough()
} )
if (cBlockInfo::GetHandler(m_Player->GetWorld()->GetBlock(BlockX, BlockY, BlockZ))->IsClickedThrough())
{ {
a_BlockX = BlockX; a_BlockX = BlockX;
a_BlockY = BlockY; a_BlockY = BlockY;
@ -1385,12 +1383,15 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace); AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
if ((a_BlockX != -1) && (a_BlockY >= 0) && (a_BlockZ != -1)) if ((a_BlockX != -1) && (a_BlockY >= 0) && (a_BlockZ != -1))
{ {
World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player); if (cChunkDef::IsValidHeight(a_BlockY))
if (a_BlockY < cChunkDef::Height - 1) {
World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player);
}
if (cChunkDef::IsValidHeight(a_BlockY + 1))
{ {
World->SendBlockTo(a_BlockX, a_BlockY + 1, a_BlockZ, m_Player); // 2 block high things World->SendBlockTo(a_BlockX, a_BlockY + 1, a_BlockZ, m_Player); // 2 block high things
} }
if (a_BlockY > 0) if (cChunkDef::IsValidHeight(a_BlockY - 1))
{ {
World->SendBlockTo(a_BlockX, a_BlockY - 1, a_BlockZ, m_Player); // 2 block high things World->SendBlockTo(a_BlockX, a_BlockY - 1, a_BlockZ, m_Player); // 2 block high things
} }
@ -1418,12 +1419,15 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e
if (a_BlockFace != BLOCK_FACE_NONE) if (a_BlockFace != BLOCK_FACE_NONE)
{ {
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace); AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player); if (cChunkDef::IsValidHeight(a_BlockY))
if (a_BlockY < cChunkDef::Height - 1) {
World->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player);
}
if (cChunkDef::IsValidHeight(a_BlockY + 1))
{ {
World->SendBlockTo(a_BlockX, a_BlockY + 1, a_BlockZ, m_Player); // 2 block high things World->SendBlockTo(a_BlockX, a_BlockY + 1, a_BlockZ, m_Player); // 2 block high things
} }
if (a_BlockY > 1) if (cChunkDef::IsValidHeight(a_BlockY - 1))
{ {
World->SendBlockTo(a_BlockX, a_BlockY - 1, a_BlockZ, m_Player); // 2 block high things World->SendBlockTo(a_BlockX, a_BlockY - 1, a_BlockZ, m_Player); // 2 block high things
} }