diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-04 11:55:09 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-04 11:55:09 +0200 |
| commit | a0d2df93272a6108f8c568e1eed665a1da5cb7ed (patch) | |
| tree | 73ce9334f32e068247665e5d7200f841f9f07009 /src/Mobs/Monster.cpp | |
| parent | Merge pull request #1138 from mc-server/enderchest (diff) | |
| download | cuberite-a0d2df93272a6108f8c568e1eed665a1da5cb7ed.tar cuberite-a0d2df93272a6108f8c568e1eed665a1da5cb7ed.tar.gz cuberite-a0d2df93272a6108f8c568e1eed665a1da5cb7ed.tar.bz2 cuberite-a0d2df93272a6108f8c568e1eed665a1da5cb7ed.tar.lz cuberite-a0d2df93272a6108f8c568e1eed665a1da5cb7ed.tar.xz cuberite-a0d2df93272a6108f8c568e1eed665a1da5cb7ed.tar.zst cuberite-a0d2df93272a6108f8c568e1eed665a1da5cb7ed.zip | |
Diffstat (limited to 'src/Mobs/Monster.cpp')
| -rw-r--r-- | src/Mobs/Monster.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 5843ca5a6..6ef90d489 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -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, (int)(GetPosX() * 8), (int)(GetPosY() * 8), (int)(GetPosZ() * 8), 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); } |