diff options
| author | Mattes D <github@xoft.cz> | 2014-07-17 10:12:22 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-07-17 10:12:22 +0200 |
| commit | 98244e96d1a810bea24a6c8463f9beb535ad2daf (patch) | |
| tree | a57dd6f82ad46ee02811f4f77bcd56a50c5b8865 /src/Mobs/Monster.cpp | |
| parent | Another fix for excessive food drain (diff) | |
| parent | Resolved backwards compatibility issues (diff) | |
| download | cuberite-98244e96d1a810bea24a6c8463f9beb535ad2daf.tar cuberite-98244e96d1a810bea24a6c8463f9beb535ad2daf.tar.gz cuberite-98244e96d1a810bea24a6c8463f9beb535ad2daf.tar.bz2 cuberite-98244e96d1a810bea24a6c8463f9beb535ad2daf.tar.lz cuberite-98244e96d1a810bea24a6c8463f9beb535ad2daf.tar.xz cuberite-98244e96d1a810bea24a6c8463f9beb535ad2daf.tar.zst cuberite-98244e96d1a810bea24a6c8463f9beb535ad2daf.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 16f75db67..73bbf217b 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, 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); } |