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

cChunk: Don't assume GetBlockEntity coords are valid

Browse Source
This commit is contained in:
peterbell10 2017-08-10 18:24:50 +01:00
parent 83ff815d1e
commit 0979cd8f17
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Chunk.cpp
View File

@ -1770,16 +1770,20 @@ void cChunk::AddBlockEntityClean(cBlockEntity * a_BlockEntity)
cBlockEntity * cChunk::GetBlockEntity(int a_BlockX, int a_BlockY, int a_BlockZ) cBlockEntity * cChunk::GetBlockEntity(int a_BlockX, int a_BlockY, int a_BlockZ)
{ {
// Check that the query coords are within chunk bounds:
ASSERT(a_BlockX >= m_PosX * cChunkDef::Width);
ASSERT(a_BlockX < m_PosX * cChunkDef::Width + cChunkDef::Width);
ASSERT(a_BlockZ >= m_PosZ * cChunkDef::Width);
ASSERT(a_BlockZ < m_PosZ * cChunkDef::Width + cChunkDef::Width);
int RelX = a_BlockX - m_PosX * cChunkDef::Width; int RelX = a_BlockX - m_PosX * cChunkDef::Width;
int RelZ = a_BlockZ - m_PosZ * cChunkDef::Width; int RelZ = a_BlockZ - m_PosZ * cChunkDef::Width;
auto itr = m_BlockEntities.find(MakeIndex(RelX, a_BlockY, RelZ)); if (
!IsValidWidth (RelX) ||
!IsValidHeight(a_BlockY) ||
!IsValidWidth (RelZ)
)
{
// Coordinates are outside outside the world, no block entities here
return nullptr;
}
auto itr = m_BlockEntities.find(MakeIndexNoCheck(RelX, a_BlockY, RelZ));
return (itr == m_BlockEntities.end()) ? nullptr : itr->second; return (itr == m_BlockEntities.end()) ? nullptr : itr->second;
} }