diff options
| author | Mattes D <github@xoft.cz> | 2014-04-28 20:58:15 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-04-28 20:58:15 +0200 |
| commit | 709015369df050d3d5b1d12b7d74ae814cd046df (patch) | |
| tree | 106568e25f564d0e0e414269a8fbb28ed3f1507e /src/Mobs/Monster.cpp | |
| parent | Fixed braces. (diff) | |
| parent | Revert "Withers now use the new invulnerable." (diff) | |
| download | cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar.gz cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar.bz2 cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar.lz cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar.xz cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.tar.zst cuberite-709015369df050d3d5b1d12b7d74ae814cd046df.zip | |
Diffstat (limited to 'src/Mobs/Monster.cpp')
| -rw-r--r-- | src/Mobs/Monster.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 14d951393..c66ab4e04 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -457,9 +457,12 @@ int cMonster::FindFirstNonAirBlockPosition(double a_PosX, double a_PosZ) -void cMonster::DoTakeDamage(TakeDamageInfo & a_TDI) +bool cMonster::DoTakeDamage(TakeDamageInfo & a_TDI) { - super::DoTakeDamage(a_TDI); + if (!super::DoTakeDamage(a_TDI)) + { + return false; + } if((m_SoundHurt != "") && (m_Health > 0)) m_World->BroadcastSoundEffect(m_SoundHurt, (int)(GetPosX() * 8), (int)(GetPosY() * 8), (int)(GetPosZ() * 8), 1.0f, 0.8f); @@ -468,6 +471,7 @@ void cMonster::DoTakeDamage(TakeDamageInfo & a_TDI) { m_Target = a_TDI.Attacker; } + return true; } |