From 3a24ed4b61d700127df722309776c8f6737e8320 Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Tue, 12 Jan 2016 15:26:51 +0200 Subject: Fixed creeper calling TargetIsInRange with null m_Target --- src/Mobs/Creeper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mobs/Creeper.cpp b/src/Mobs/Creeper.cpp index b909ab952..d88c99953 100644 --- a/src/Mobs/Creeper.cpp +++ b/src/Mobs/Creeper.cpp @@ -27,7 +27,7 @@ void cCreeper::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) { super::Tick(a_Dt, a_Chunk); - if (!TargetIsInRange() && !m_BurnedWithFlintAndSteel) + if ((m_Target == nullptr) || (!TargetIsInRange() && !m_BurnedWithFlintAndSteel)) { if (m_bIsBlowing) { @@ -130,7 +130,7 @@ bool cCreeper::Attack(std::chrono::milliseconds a_Dt) m_World->BroadcastSoundEffect("game.tnt.primed", GetPosX(), GetPosY(), GetPosZ(), 1.f, (0.75f + (static_cast((GetUniqueID() * 23) % 32)) / 64)); m_bIsBlowing = true; m_World->BroadcastEntityMetadata(*this); - + return true; } return false; -- cgit v1.2.3