diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-01-12 13:46:02 +0100 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-01-12 13:46:02 +0100 |
| commit | d4e99aedb1d202b3fa6f6b3f5bd5fd31a4ecc2f3 (patch) | |
| tree | f313b63965b5dde2d2d9255b3d0cda2dda1068e4 /src/Mobs/Ghast.cpp | |
| parent | Merge pull request #2860 from LogicParrot/wolfChecks (diff) | |
| parent | Fix mob attack interval (diff) | |
| download | cuberite-d4e99aedb1d202b3fa6f6b3f5bd5fd31a4ecc2f3.tar cuberite-d4e99aedb1d202b3fa6f6b3f5bd5fd31a4ecc2f3.tar.gz cuberite-d4e99aedb1d202b3fa6f6b3f5bd5fd31a4ecc2f3.tar.bz2 cuberite-d4e99aedb1d202b3fa6f6b3f5bd5fd31a4ecc2f3.tar.lz cuberite-d4e99aedb1d202b3fa6f6b3f5bd5fd31a4ecc2f3.tar.xz cuberite-d4e99aedb1d202b3fa6f6b3f5bd5fd31a4ecc2f3.tar.zst cuberite-d4e99aedb1d202b3fa6f6b3f5bd5fd31a4ecc2f3.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; |