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/Villager.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 '')
-rw-r--r-- | src/Mobs/Villager.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Mobs/Villager.cpp b/src/Mobs/Villager.cpp index d049acc1e..41283acf4 100644 --- a/src/Mobs/Villager.cpp +++ b/src/Mobs/Villager.cpp @@ -23,9 +23,13 @@ cVillager::cVillager(eVillagerType VillagerType) : -void cVillager::DoTakeDamage(TakeDamageInfo & a_TDI) +bool cVillager::DoTakeDamage(TakeDamageInfo & a_TDI) { - super::DoTakeDamage(a_TDI); + if (!super::DoTakeDamage(a_TDI)) + { + return false; + } + if ((a_TDI.Attacker != NULL) && a_TDI.Attacker->IsPlayer()) { if (m_World->GetTickRandomNumber(5) == 3) @@ -33,6 +37,7 @@ void cVillager::DoTakeDamage(TakeDamageInfo & a_TDI) m_World->BroadcastEntityStatus(*this, esVillagerAngry); } } + return true; } |