diff options
| author | Mattes D <github@xoft.cz> | 2014-07-17 11:23:09 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-07-17 11:23:09 +0200 |
| commit | ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4 (patch) | |
| tree | e2a6e048422755b6a5b04c0fbe3afd0bfbf1c700 /src/Mobs/AggressiveMonster.cpp | |
| parent | Merge pull request #1193 from mc-server/deathmessages (diff) | |
| parent | Fixed 3 MSVC warnings in SplashPotionEntity. (diff) | |
| download | cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.gz cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.bz2 cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.lz cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.xz cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.zst cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Mobs/AggressiveMonster.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Mobs/AggressiveMonster.cpp b/src/Mobs/AggressiveMonster.cpp index 85b122034..de881f4eb 100644 --- a/src/Mobs/AggressiveMonster.cpp +++ b/src/Mobs/AggressiveMonster.cpp @@ -95,12 +95,14 @@ void cAggressiveMonster::Attack(float a_Dt) { m_AttackInterval += a_Dt * m_AttackRate; - if ((m_Target != NULL) && (m_AttackInterval > 3.0)) + if ((m_Target == NULL) || (m_AttackInterval < 3.0)) { - // Setting this higher gives us more wiggle room for attackrate - m_AttackInterval = 0.0; - m_Target->TakeDamage(dtMobAttack, this, m_AttackDamage, 0); + return; } + + // Setting this higher gives us more wiggle room for attackrate + m_AttackInterval = 0.0; + m_Target->TakeDamage(dtMobAttack, this, m_AttackDamage, 0); } |