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/Entities/ItemFrame.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 '')
-rw-r--r-- | src/Entities/ItemFrame.cpp | 6 |
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); |