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

Merge pull request #2706 from Gargaj/deadcreeper

Browse Source 
Stop creepers from exploding even if they just died
This commit is contained in:
Mattes D 2015-12-09 07:47:06 +01:00
commit ac8504a6ef
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mobs/Creeper.cpp
View File

@ -43,7 +43,7 @@ void cCreeper::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
m_ExplodingTimer += 1; m_ExplodingTimer += 1;
} }
if (m_ExplodingTimer == 30) if ((m_ExplodingTimer == 30) && (GetHealth() > 0.0)) // only explode when not already dead
{ {
m_World->DoExplosionAt((m_bIsCharged ? 5 : 3), GetPosX(), GetPosY(), GetPosZ(), false, esMonster, this); m_World->DoExplosionAt((m_bIsCharged ? 5 : 3), GetPosX(), GetPosY(), GetPosZ(), false, esMonster, this);
Destroy(); // Just in case we aren't killed by the explosion Destroy(); // Just in case we aren't killed by the explosion