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

Merge pull request #1193 from mc-server/deathmessages

Browse Source 
Death messages
This commit is contained in:
Mattes D
2014-07-17 10:12:22 +02:00
parent 174906efca 2189f37c20
commit 98244e96d1
21 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mobs/Monster.cpp
View File

@@ -492,9 +492,9 @@ bool cMonster::DoTakeDamage(TakeDamageInfo & a_TDI)
void cMonster::KilledBy(cEntity * a_Killer)
void cMonster::KilledBy(TakeDamageInfo & a_TDI)
{
super::KilledBy(a_Killer);
super::KilledBy(a_TDI);
if (m_SoundHurt != "")
{
m_World->BroadcastSoundEffect(m_SoundDeath, GetPosX(), GetPosY(), GetPosZ(), 1.0f, 0.8f);
@@ -558,7 +558,7 @@ void cMonster::KilledBy(cEntity * a_Killer)
break;
}
}
if ((a_Killer != NULL) && (!IsBaby()))
if ((a_TDI.Attacker != NULL) && (!IsBaby()))
{
m_World->SpawnExperienceOrb(GetPosX(), GetPosY(), GetPosZ(), Reward);
}