diff options
| author | worktycho <work.tycho@gmail.com> | 2015-05-09 00:20:22 +0200 |
|---|---|---|
| committer | worktycho <work.tycho@gmail.com> | 2015-05-09 00:20:22 +0200 |
| commit | 1cef39cb73f5a9130d2cb9d497ca44350fb401d8 (patch) | |
| tree | 90e1091c4b21ca5bbd980cd7029423111b7b1e6c | |
| parent | Merge pull request #1945 from Woazboat/CodeCleanup_refactored (diff) | |
| download | cuberite-1cef39cb73f5a9130d2cb9d497ca44350fb401d8.tar cuberite-1cef39cb73f5a9130d2cb9d497ca44350fb401d8.tar.gz cuberite-1cef39cb73f5a9130d2cb9d497ca44350fb401d8.tar.bz2 cuberite-1cef39cb73f5a9130d2cb9d497ca44350fb401d8.tar.lz cuberite-1cef39cb73f5a9130d2cb9d497ca44350fb401d8.tar.xz cuberite-1cef39cb73f5a9130d2cb9d497ca44350fb401d8.tar.zst cuberite-1cef39cb73f5a9130d2cb9d497ca44350fb401d8.zip | |
| -rw-r--r-- | src/Mobs/Monster.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 84f58ff85..9df5bd930 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -264,12 +264,14 @@ bool cMonster::EnsureProperDestination(cChunk & a_Chunk) cChunk * Chunk = a_Chunk.GetNeighborChunk(m_FinalDestination.x, m_FinalDestination.z); BLOCKTYPE BlockType; NIBBLETYPE BlockMeta; - int RelX = m_FinalDestination.x - Chunk->GetPosX() * cChunkDef::Width; - int RelZ = m_FinalDestination.z - Chunk->GetPosZ() * cChunkDef::Width; + if ((Chunk == nullptr) || !Chunk->IsValid()) { return false; } + + int RelX = m_FinalDestination.x - Chunk->GetPosX() * cChunkDef::Width; + int RelZ = m_FinalDestination.z - Chunk->GetPosZ() * cChunkDef::Width; // If destination in the air, go down to the lowest air block. while (m_FinalDestination.y > 0) |