diff options
author | Mattes D <github@xoft.cz> | 2014-01-25 22:36:32 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-01-25 22:36:32 +0100 |
commit | cdcad2237a91dfd18cde539c300034f84bc8c07b (patch) | |
tree | 5f3266637858980f29ff3ee4cc4c116e575797d3 /src/Mobs/Zombie.cpp | |
parent | Merge pull request #583 from mc-server/ChangeToPolarSSL (diff) | |
parent | Did what xoft recommended (diff) | |
download | cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar.gz cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar.bz2 cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar.lz cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar.xz cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.tar.zst cuberite-cdcad2237a91dfd18cde539c300034f84bc8c07b.zip |
Diffstat (limited to 'src/Mobs/Zombie.cpp')
-rw-r--r-- | src/Mobs/Zombie.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Mobs/Zombie.cpp b/src/Mobs/Zombie.cpp index a046fcc92..27e8ed5fb 100644 --- a/src/Mobs/Zombie.cpp +++ b/src/Mobs/Zombie.cpp @@ -34,15 +34,18 @@ void cZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer) void cZombie::MoveToPosition(const Vector3f & a_Position) { - m_Destination = 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 ((m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15) && (m_World->GetTimeOfDay() < 13187) && !IsOnFire()) + // 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 ( + !IsOnFire() && + (m_World->GetTimeOfDay() < 13187) && + (m_World->GetBlockSkyLight((int)a_Position.x, (int)a_Position.y, (int)a_Position.z) == 15) + ) { m_bMovingToDestination = false; return; } - m_bMovingToDestination = true; + + super::MoveToPosition(a_Position); } |