diff options
author | worktycho <work.tycho@gmail.com> | 2015-11-08 23:08:40 +0100 |
---|---|---|
committer | worktycho <work.tycho@gmail.com> | 2015-11-08 23:08:40 +0100 |
commit | a1926ca16e76f082b2139b1686fd19c0c42c585e (patch) | |
tree | 3a8a282d1966476ea8f6031a1ea15388330fede8 /src/Mobs/Skeleton.cpp | |
parent | Merge pull request #2616 from Gargaj/patch-1 (diff) | |
parent | fix cavespider poisoning even if attack is in cooldown (diff) | |
download | cuberite-a1926ca16e76f082b2139b1686fd19c0c42c585e.tar cuberite-a1926ca16e76f082b2139b1686fd19c0c42c585e.tar.gz cuberite-a1926ca16e76f082b2139b1686fd19c0c42c585e.tar.bz2 cuberite-a1926ca16e76f082b2139b1686fd19c0c42c585e.tar.lz cuberite-a1926ca16e76f082b2139b1686fd19c0c42c585e.tar.xz cuberite-a1926ca16e76f082b2139b1686fd19c0c42c585e.tar.zst cuberite-a1926ca16e76f082b2139b1686fd19c0c42c585e.zip |
Diffstat (limited to 'src/Mobs/Skeleton.cpp')
-rw-r--r-- | src/Mobs/Skeleton.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Mobs/Skeleton.cpp b/src/Mobs/Skeleton.cpp index 767e5b95c..27e038e1e 100644 --- a/src/Mobs/Skeleton.cpp +++ b/src/Mobs/Skeleton.cpp @@ -48,7 +48,7 @@ void cSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer) -void cSkeleton::Attack(std::chrono::milliseconds a_Dt) +bool cSkeleton::Attack(std::chrono::milliseconds a_Dt) { cFastRandom Random; m_AttackInterval += (static_cast<float>(a_Dt.count()) / 1000) * m_AttackRate; @@ -60,17 +60,20 @@ void cSkeleton::Attack(std::chrono::milliseconds a_Dt) cArrowEntity * Arrow = new cArrowEntity(this, GetPosX(), GetPosY() + 1, GetPosZ(), Speed); if (Arrow == nullptr) { - return; + return false; } if (!Arrow->Initialize(*m_World)) { delete Arrow; Arrow = nullptr; - return; + return false; } m_World->BroadcastSpawnEntity(*Arrow); m_AttackInterval = 0.0; + + return true; } + return false; } |