diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-22 21:44:55 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-22 21:44:55 +0200 |
| commit | dad0037f987df594d6a1971af5b29f89c2d27901 (patch) | |
| tree | cd585ef739755eff705378a7a1a4e85ba596cc40 | |
| parent | Some Entity.cpp style improvements (diff) | |
| download | cuberite-dad0037f987df594d6a1971af5b29f89c2d27901.tar cuberite-dad0037f987df594d6a1971af5b29f89c2d27901.tar.gz cuberite-dad0037f987df594d6a1971af5b29f89c2d27901.tar.bz2 cuberite-dad0037f987df594d6a1971af5b29f89c2d27901.tar.lz cuberite-dad0037f987df594d6a1971af5b29f89c2d27901.tar.xz cuberite-dad0037f987df594d6a1971af5b29f89c2d27901.tar.zst cuberite-dad0037f987df594d6a1971af5b29f89c2d27901.zip | |
| -rw-r--r-- | src/Mobs/Skeleton.cpp | 5 | ||||
| -rw-r--r-- | src/Mobs/Zombie.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/Mobs/Skeleton.cpp b/src/Mobs/Skeleton.cpp index e3357185d..0641a3d57 100644 --- a/src/Mobs/Skeleton.cpp +++ b/src/Mobs/Skeleton.cpp @@ -49,11 +49,10 @@ void cSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer) void cSkeleton::MoveToPosition(const Vector3f & a_Position) { - // If the destination is in the sun and if it is not night AND the skeleton isn't on fire then block the movement. + // If the destination is sufficiently skylight challenged AND the skeleton isn't on fire then block the movement if ( !IsOnFire() && - (m_World->GetTimeOfDay() < 13187) && - (m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15) + (m_World->GetBlockSkyLight((int)floor(a_Position.x), (int)floor(a_Position.y), (int)floor(a_Position.z)) - m_World->GetSkyDarkness() > 8) ) { m_bMovingToDestination = false; diff --git a/src/Mobs/Zombie.cpp b/src/Mobs/Zombie.cpp index f19e096ee..725790ed9 100644 --- a/src/Mobs/Zombie.cpp +++ b/src/Mobs/Zombie.cpp @@ -44,11 +44,10 @@ void cZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer) void cZombie::MoveToPosition(const Vector3f & a_Position) { - // If the destination is in the sun and if it is not night AND the zombie isn't on fire then block the movement. + // If the destination is sufficiently skylight challenged AND the skeleton isn't on fire then block the movement if ( !IsOnFire() && - (m_World->GetTimeOfDay() < 13187) && - (m_World->GetBlockSkyLight((int)a_Position.x, (int)a_Position.y, (int)a_Position.z) == 15) + (m_World->GetBlockSkyLight((int)floor(a_Position.x), (int)floor(a_Position.y), (int)floor(a_Position.z)) - m_World->GetSkyDarkness() > 8) ) { m_bMovingToDestination = false; |