diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-11-29 12:05:35 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-11-29 12:05:35 +0100 |
| commit | 648fee1a087cb97da9a4646d72ffc590e7837a67 (patch) | |
| tree | eb55b68428a303089bc1120e9c3593542059f18e /src/Mobs/Monster.cpp | |
| parent | Finished mob spawner implementation. (diff) | |
| parent | Merge pull request #1619 from mc-server/WarningFixes (diff) | |
| download | cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar.gz cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar.bz2 cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar.lz cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar.xz cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.tar.zst cuberite-648fee1a087cb97da9a4646d72ffc590e7837a67.zip | |
Diffstat (limited to 'src/Mobs/Monster.cpp')
| -rw-r--r-- | src/Mobs/Monster.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 23b4d9f45..5319bdf91 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -160,7 +160,7 @@ void cMonster::TickPathFinding() BLOCKTYPE BlockAtYP = m_World->GetBlock(gCrossCoords[i].x + PosX, PosY + 1, gCrossCoords[i].z + PosZ); BLOCKTYPE BlockAtYPP = m_World->GetBlock(gCrossCoords[i].x + PosX, PosY + 2, gCrossCoords[i].z + PosZ); int LowestY = FindFirstNonAirBlockPosition(gCrossCoords[i].x + PosX, gCrossCoords[i].z + PosZ); - BLOCKTYPE BlockAtLowestY = m_World->GetBlock(gCrossCoords[i].x + PosX, LowestY, gCrossCoords[i].z + PosZ); + BLOCKTYPE BlockAtLowestY = (LowestY >= cChunkDef::Height) ? E_BLOCK_AIR : m_World->GetBlock(gCrossCoords[i].x + PosX, LowestY, gCrossCoords[i].z + PosZ); if ( (!cBlockInfo::IsSolid(BlockAtY)) && @@ -453,7 +453,7 @@ int cMonster::FindFirstNonAirBlockPosition(double a_PosX, double a_PosZ) } else { - while (cBlockInfo::IsSolid(m_World->GetBlock((int)floor(a_PosX), PosY, (int)floor(a_PosZ))) && (PosY < cChunkDef::Height)) + while ((PosY < cChunkDef::Height) && cBlockInfo::IsSolid(m_World->GetBlock((int)floor(a_PosX), PosY, (int)floor(a_PosZ)))) { PosY++; } |