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

Out of world blocks are now always considered air blocks

Browse Source
This commit is contained in:
LogicParrot
2016-03-24 18:18:14 +02:00
parent 82fa65f8b6
commit 77bf00a599
4 changed files with 33 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ChunkData.cpp
View File

@@ -150,9 +150,14 @@ cChunkData::~cChunkData()
BLOCKTYPE cChunkData::GetBlock(int a_X, int a_Y, int a_Z) const
{
ASSERT((a_X >= 0) && (a_X < cChunkDef::Width));
ASSERT((a_Y >= 0) && (a_Y < cChunkDef::Height));
ASSERT((a_Z >= 0) && (a_Z < cChunkDef::Width));
if (
(a_X < 0) || (a_X >= cChunkDef::Width) ||
(a_Y < 0) || (a_Y >= cChunkDef::Height) ||
(a_Z < 0) || (a_Z >= cChunkDef::Width)
)
{
return E_BLOCK_AIR; // Coordinates are outside outside the world, so this must be an air block
}
int Section = a_Y / SectionHeight;
if (m_Sections[Section] != nullptr)
{
@@ -222,7 +227,7 @@ NIBBLETYPE cChunkData::GetMeta(int a_RelX, int a_RelY, int a_RelZ) const
return 0;
}
}
ASSERT(!"cChunkData::GetMeta(): coords out of chunk range!");
// Coordinates are outside outside the world, so it must be an air block with a blank meta
return 0;
}