diff options
author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-01-12 11:11:10 +0100 |
---|---|---|
committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-01-12 13:20:17 +0100 |
commit | 21df3cb0d8a194461bbcec5803c5d6243f254a95 (patch) | |
tree | 77a4d9c9b928c8bca051b5e09a4299ae189201a8 /src/Mobs/Ghast.cpp | |
parent | Merge pull request #2857 from LogicParrot/wolf (diff) | |
download | cuberite-21df3cb0d8a194461bbcec5803c5d6243f254a95.tar cuberite-21df3cb0d8a194461bbcec5803c5d6243f254a95.tar.gz cuberite-21df3cb0d8a194461bbcec5803c5d6243f254a95.tar.bz2 cuberite-21df3cb0d8a194461bbcec5803c5d6243f254a95.tar.lz cuberite-21df3cb0d8a194461bbcec5803c5d6243f254a95.tar.xz cuberite-21df3cb0d8a194461bbcec5803c5d6243f254a95.tar.zst cuberite-21df3cb0d8a194461bbcec5803c5d6243f254a95.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Mobs/Ghast.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/Mobs/Ghast.cpp b/src/Mobs/Ghast.cpp index fe3cc8be3..9ac16866e 100644 --- a/src/Mobs/Ghast.cpp +++ b/src/Mobs/Ghast.cpp @@ -34,9 +34,7 @@ void cGhast::GetDrops(cItems & a_Drops, cEntity * a_Killer) bool cGhast::Attack(std::chrono::milliseconds a_Dt) { - m_AttackInterval += (static_cast<float>(a_Dt.count()) / 1000) * m_AttackRate; - - if ((m_Target != nullptr) && (m_AttackInterval > 3.0)) + if ((m_Target != nullptr) && (m_AttackCoolDownTicksLeft == 0)) { // Setting this higher gives us more wiggle room for attackrate Vector3d Speed = GetLookVector() * 20; @@ -53,8 +51,7 @@ bool cGhast::Attack(std::chrono::milliseconds a_Dt) return false; } m_World->BroadcastSpawnEntity(*GhastBall); - m_AttackInterval = 0.0; - + ResetAttackCooldown(); return true; } return false; |