summaryrefslogtreecommitdiffstats
path: root/src/Entities/ItemFrame.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/Entities/ItemFrame.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/Entities/ItemFrame.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/ItemFrame.cpp b/src/Entities/ItemFrame.cpp
index 7bc7bda8d..4cd707faa 100644
--- a/src/Entities/ItemFrame.cpp
+++ b/src/Entities/ItemFrame.cpp
@@ -51,17 +51,17 @@ void cItemFrame::OnRightClicked(cPlayer & a_Player)
-void cItemFrame::KilledBy(cEntity * a_Killer)
+void cItemFrame::KilledBy(TakeDamageInfo & a_TDI)
{
if (m_Item.IsEmpty())
{
SetHealth(0);
- super::KilledBy(a_Killer);
+ super::KilledBy(a_TDI);
Destroy();
return;
}
- if ((a_Killer != NULL) && a_Killer->IsPlayer() && !((cPlayer *)a_Killer)->IsGameModeCreative())
+ if ((a_TDI.Attacker != NULL) && a_TDI.Attacker->IsPlayer() && !((cPlayer *)a_TDI.Attacker)->IsGameModeCreative())
{
cItems Item;
Item.push_back(m_Item);