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/PassiveMonster.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 'src/Mobs/PassiveMonster.cpp')
| -rw-r--r-- | src/Mobs/PassiveMonster.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Mobs/PassiveMonster.cpp b/src/Mobs/PassiveMonster.cpp index 904cd63cc..2861d7314 100644 --- a/src/Mobs/PassiveMonster.cpp +++ b/src/Mobs/PassiveMonster.cpp @@ -18,13 +18,17 @@ cPassiveMonster::cPassiveMonster(const AString & a_ConfigName, eType a_MobType, -void cPassiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI) +bool cPassiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI) { - super::DoTakeDamage(a_TDI); + if (!super::DoTakeDamage(a_TDI)) + { + return false; + } if ((a_TDI.Attacker != this) && (a_TDI.Attacker != NULL)) { m_EMState = ESCAPING; } + return true; } |