From 392a3d319c8f8c92bc3e9c9d2c1707db955a2ae2 Mon Sep 17 00:00:00 2001 From: Gargaj Date: Sun, 8 Nov 2015 13:44:17 +0100 Subject: fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'master' into cavespider-attack fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack --- src/Mobs/Ghast.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/Mobs/Ghast.cpp') diff --git a/src/Mobs/Ghast.cpp b/src/Mobs/Ghast.cpp index 15bbe484b..fe3cc8be3 100644 --- a/src/Mobs/Ghast.cpp +++ b/src/Mobs/Ghast.cpp @@ -32,7 +32,7 @@ void cGhast::GetDrops(cItems & a_Drops, cEntity * a_Killer) -void cGhast::Attack(std::chrono::milliseconds a_Dt) +bool cGhast::Attack(std::chrono::milliseconds a_Dt) { m_AttackInterval += (static_cast(a_Dt.count()) / 1000) * m_AttackRate; @@ -44,17 +44,20 @@ void cGhast::Attack(std::chrono::milliseconds a_Dt) cGhastFireballEntity * GhastBall = new cGhastFireballEntity(this, GetPosX(), GetPosY() + 1, GetPosZ(), Speed); if (GhastBall == nullptr) { - return; + return false; } if (!GhastBall->Initialize(*m_World)) { delete GhastBall; GhastBall = nullptr; - return; + return false; } m_World->BroadcastSpawnEntity(*GhastBall); m_AttackInterval = 0.0; + + return true; } + return false; } -- cgit v1.2.3