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

Fix crash in cLineBlockTracer 

* Fixes #1418
This commit is contained in:
Tiger Wang 2014-09-21 19:24:45 +01:00
parent 14123c6d16
commit cb70925077
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/LineBlockTracer.cpp
View File

@ -227,9 +227,11 @@ bool cLineBlockTracer::Item(cChunk * a_Chunk)
}
// Update the current chunk
if (a_Chunk != NULL)
a_Chunk = a_Chunk->GetNeighborChunk(m_CurrentX, m_CurrentZ);
if (a_Chunk == NULL)
{
a_Chunk = a_Chunk->GetNeighborChunk(m_CurrentX, m_CurrentZ);
m_Callbacks->OnNoChunk();
return false;
}
if (a_Chunk->IsValid())
@ -245,13 +247,10 @@ bool cLineBlockTracer::Item(cChunk * a_Chunk)
return false;
}
}
else
else if (m_Callbacks->OnNextBlockNoData(m_CurrentX, m_CurrentY, m_CurrentZ, m_CurrentFace))
{
if (m_Callbacks->OnNextBlockNoData(m_CurrentX, m_CurrentY, m_CurrentZ, m_CurrentFace))
{
// The callback terminated the trace
return false;
}
// The callback terminated the trace
return false;
}
}
}