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

Merge pull request #940 from Howaner/GlobalFixes

Browse Source 
Add entity invulnerable
This commit is contained in:
Mattes D
2014-04-28 20:58:15 +02:00
parent 8ab8fb344f acd2804f31
commit 709015369d
26 changed files with 132 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mobs/Monster.cpp
View File

@@ -457,9 +457,12 @@ int cMonster::FindFirstNonAirBlockPosition(double a_PosX, double a_PosZ)
void cMonster::DoTakeDamage(TakeDamageInfo & a_TDI)
bool cMonster::DoTakeDamage(TakeDamageInfo & a_TDI)
{
super::DoTakeDamage(a_TDI);
if (!super::DoTakeDamage(a_TDI))
{
return false;
}
if((m_SoundHurt != "") && (m_Health > 0))
m_World->BroadcastSoundEffect(m_SoundHurt, (int)(GetPosX() * 8), (int)(GetPosY() * 8), (int)(GetPosZ() * 8), 1.0f, 0.8f);
@@ -468,6 +471,7 @@ void cMonster::DoTakeDamage(TakeDamageInfo & a_TDI)
{
m_Target = a_TDI.Attacker;
}
return true;
}