flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2862 from LogicParrot/creeper

Browse Source 
Fixed creeper calling TargetIsInRange with null m_Target
This commit is contained in:
LogicParrot 2016-01-12 15:42:39 +02:00
commit 062b51c822
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mobs/Creeper.cpp
View File

@ -27,7 +27,7 @@ void cCreeper::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{ {
super::Tick(a_Dt, a_Chunk); super::Tick(a_Dt, a_Chunk);
if (!TargetIsInRange() && !m_BurnedWithFlintAndSteel) if ((m_Target == nullptr) || (!TargetIsInRange() && !m_BurnedWithFlintAndSteel))
{ {
if (m_bIsBlowing) 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<float>((GetUniqueID() * 23) % 32)) / 64)); m_World->BroadcastSoundEffect("game.tnt.primed", GetPosX(), GetPosY(), GetPosZ(), 1.f, (0.75f + (static_cast<float>((GetUniqueID() * 23) % 32)) / 64));
m_bIsBlowing = true; m_bIsBlowing = true;
m_World->BroadcastEntityMetadata(*this); m_World->BroadcastEntityMetadata(*this);
return true; return true;
} }
return false; return false;