diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-04-26 00:32:30 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-04-26 00:32:30 +0200 |
| commit | 7e76f030aa2e6d39ac7fe9fb6a8a3db44bf3dd5f (patch) | |
| tree | c06c0e15699d0a120820176fe979dcbceb63b8b0 /src/Mobs/Villager.cpp | |
| parent | Merge pull request #935 from archshift/projectile-fixes (diff) | |
| download | cuberite-7e76f030aa2e6d39ac7fe9fb6a8a3db44bf3dd5f.tar cuberite-7e76f030aa2e6d39ac7fe9fb6a8a3db44bf3dd5f.tar.gz cuberite-7e76f030aa2e6d39ac7fe9fb6a8a3db44bf3dd5f.tar.bz2 cuberite-7e76f030aa2e6d39ac7fe9fb6a8a3db44bf3dd5f.tar.lz cuberite-7e76f030aa2e6d39ac7fe9fb6a8a3db44bf3dd5f.tar.xz cuberite-7e76f030aa2e6d39ac7fe9fb6a8a3db44bf3dd5f.tar.zst cuberite-7e76f030aa2e6d39ac7fe9fb6a8a3db44bf3dd5f.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; } |