summaryrefslogtreecommitdiffstats
path: root/src/Mobs/PassiveMonster.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-04-28 20:58:15 +0200
committerMattes D <github@xoft.cz>2014-04-28 20:58:15 +0200
commit709015369df050d3d5b1d12b7d74ae814cd046df (patch)
tree106568e25f564d0e0e414269a8fbb28ed3f1507e /src/Mobs/PassiveMonster.cpp
parentFixed braces. (diff)
parentRevert "Withers now use the new invulnerable." (diff)
downloadcuberite-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/PassiveMonster.cpp')
-rw-r--r--src/Mobs/PassiveMonster.cpp8
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;
}