diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-22 19:30:31 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-22 19:30:31 +0200 |
| commit | 18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2 (patch) | |
| tree | 089b3be905aa030367925762c58bd30b08f5f3f6 /src/LineBlockTracer.cpp | |
| parent | Merge branch 'master' into saplingsandleaves (diff) | |
| parent | Updated prefabs to current Gallery content. (diff) | |
| download | cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.gz cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.bz2 cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.lz cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.xz cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.zst cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.zip | |
Diffstat (limited to 'src/LineBlockTracer.cpp')
| -rw-r--r-- | src/LineBlockTracer.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/LineBlockTracer.cpp b/src/LineBlockTracer.cpp index 2395aa43e..f03e796d1 100644 --- a/src/LineBlockTracer.cpp +++ b/src/LineBlockTracer.cpp @@ -212,6 +212,26 @@ bool cLineBlockTracer::Item(cChunk * a_Chunk) return true; } + if ((m_CurrentY < 0) || (m_CurrentY >= cChunkDef::Height)) + { + // We've gone out of the world, that's the end of this trace + double IntersectX, IntersectZ; + CalcXZIntersection(m_CurrentY, IntersectX, IntersectZ); + if (m_Callbacks->OnOutOfWorld(IntersectX, m_CurrentY, IntersectZ)) + { + // The callback terminated the trace + return false; + } + m_Callbacks->OnNoMoreHits(); + return true; + } + + // Update the current chunk + if (a_Chunk != NULL) + { + a_Chunk = a_Chunk->GetNeighborChunk(m_CurrentX, m_CurrentZ); + } + if (a_Chunk->IsValid()) { BLOCKTYPE BlockType; @@ -233,26 +253,6 @@ bool cLineBlockTracer::Item(cChunk * a_Chunk) return false; } } - - // Update the current chunk - if (a_Chunk != NULL) - { - a_Chunk = a_Chunk->GetNeighborChunk(m_CurrentX, m_CurrentZ); - } - - if ((m_CurrentY < 0) || (m_CurrentY >= cChunkDef::Height)) - { - // We've gone out of the world, that's the end of this trace - double IntersectX, IntersectZ; - CalcXZIntersection(m_CurrentY, IntersectX, IntersectZ); - if (m_Callbacks->OnOutOfWorld(IntersectX, m_CurrentY, IntersectZ)) - { - // The callback terminated the trace - return false; - } - m_Callbacks->OnNoMoreHits(); - return true; - } } } |