diff options
author | madmaxoft <github@xoft.cz> | 2014-04-28 22:05:02 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-04-28 22:05:02 +0200 |
commit | 0b16e6821ff475dca0539426ec403241170ce93d (patch) | |
tree | e272cae036cd9117e1d1f4cea3555c0c0d3aa748 /src/Mobs/PassiveAggressiveMonster.cpp | |
parent | Added the G1 root cert. (diff) | |
parent | Merge pull request #940 from Howaner/GlobalFixes (diff) | |
download | cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.gz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.bz2 cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.lz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.xz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.zst cuberite-0b16e6821ff475dca0539426ec403241170ce93d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Mobs/PassiveAggressiveMonster.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Mobs/PassiveAggressiveMonster.cpp b/src/Mobs/PassiveAggressiveMonster.cpp index 4b45f9a2a..24501b1ba 100644 --- a/src/Mobs/PassiveAggressiveMonster.cpp +++ b/src/Mobs/PassiveAggressiveMonster.cpp @@ -19,9 +19,12 @@ cPassiveAggressiveMonster::cPassiveAggressiveMonster(const AString & a_ConfigNam -void cPassiveAggressiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI) +bool cPassiveAggressiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI) { - super::DoTakeDamage(a_TDI); + if (!super::DoTakeDamage(a_TDI)) + { + return false; + } if ((m_Target != NULL) && (m_Target->IsPlayer())) { @@ -30,6 +33,7 @@ void cPassiveAggressiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI) m_EMState = CHASING; } } + return true; } |