diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-04-05 23:12:17 +0200 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-04-05 23:12:17 +0200 |
commit | 23395a5ce1daab24465d607575c09e06e5b7c449 (patch) | |
tree | 18555c220fc6e602b071a935b190ef25444f18a9 /src/Mobs/Monster.cpp | |
parent | Fixed tolua++ override support (diff) | |
parent | Fixed Endiannes conversion routines for floats and doubles. (diff) | |
download | cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar.gz cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar.bz2 cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar.lz cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar.xz cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar.zst cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Mobs/Monster.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 16d6aed1f..aa6071515 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -111,9 +111,9 @@ void cMonster::SpawnOn(cClientHandle & a_Client) void cMonster::TickPathFinding() { - int PosX = (int)floor(GetPosX()); - int PosY = (int)floor(GetPosY()); - int PosZ = (int)floor(GetPosZ()); + const int PosX = (int)floor(GetPosX()); + const int PosY = (int)floor(GetPosY()); + const int PosZ = (int)floor(GetPosZ()); m_FinalDestination.y = (double)FindFirstNonAirBlockPosition(m_FinalDestination.x, m_FinalDestination.z); @@ -130,14 +130,16 @@ void cMonster::TickPathFinding() { 0, 1}, { 0,-1}, } ; + + if ((PosY - 1 < 0) || (PosY + 2 > cChunkDef::Height) /* PosY + 1 will never be true if PosY + 2 is not */) + { + // Too low/high, can't really do anything + FinishPathFinding(); + return; + } for (size_t i = 0; i < ARRAYCOUNT(gCrossCoords); i++) { - if ((gCrossCoords[i].x + PosX == PosX) && (gCrossCoords[i].z + PosZ == PosZ)) - { - continue; - } - if (IsCoordinateInTraversedList(Vector3i(gCrossCoords[i].x + PosX, PosY, gCrossCoords[i].z + PosZ))) { continue; @@ -758,6 +760,7 @@ cMonster::eFamily cMonster::FamilyFromType(eType a_Type) case mtSquid: return mfWater; case mtVillager: return mfPassive; case mtWitch: return mfHostile; + case mtWither: return mfHostile; case mtWolf: return mfHostile; case mtZombie: return mfHostile; case mtZombiePigman: return mfHostile; |