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/Wolf.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 'src/Mobs/Wolf.cpp')
-rw-r--r-- | src/Mobs/Wolf.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp index f02b8a4fc..e6268abc7 100644 --- a/src/Mobs/Wolf.cpp +++ b/src/Mobs/Wolf.cpp @@ -25,14 +25,19 @@ cWolf::cWolf(void) : -void cWolf::DoTakeDamage(TakeDamageInfo & a_TDI) +bool cWolf::DoTakeDamage(TakeDamageInfo & a_TDI) { - super::DoTakeDamage(a_TDI); + if (super::DoTakeDamage(a_TDI)) + { + return false; + } + if (!m_IsTame) { m_IsAngry = true; } m_World->BroadcastEntityMetadata(*this); // Broadcast health and possibly angry face + return true; } |