summaryrefslogtreecommitdiffstats
path: root/src/Mobs/Monster.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-07-17 10:12:22 +0200
committerMattes D <github@xoft.cz>2014-07-17 10:12:22 +0200
commit98244e96d1a810bea24a6c8463f9beb535ad2daf (patch)
treea57dd6f82ad46ee02811f4f77bcd56a50c5b8865 /src/Mobs/Monster.cpp
parentAnother fix for excessive food drain (diff)
parentResolved backwards compatibility issues (diff)
downloadcuberite-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 '')
-rw-r--r--src/Mobs/Monster.cpp6
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);
}