diff options
| author | madmaxoft <github@xoft.cz> | 2014-07-17 11:01:26 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-07-17 11:01:26 +0200 |
| commit | 7d0fc85d0079febec4af110c4d6404944d1f3eb0 (patch) | |
| tree | a2f21d0a5575631c959f5e48652e387e72d8c08b /src/Entities/ItemFrame.cpp | |
| parent | Reformatted cItemPotionHandler. (diff) | |
| parent | Merge pull request #1193 from mc-server/deathmessages (diff) | |
| download | cuberite-7d0fc85d0079febec4af110c4d6404944d1f3eb0.tar cuberite-7d0fc85d0079febec4af110c4d6404944d1f3eb0.tar.gz cuberite-7d0fc85d0079febec4af110c4d6404944d1f3eb0.tar.bz2 cuberite-7d0fc85d0079febec4af110c4d6404944d1f3eb0.tar.lz cuberite-7d0fc85d0079febec4af110c4d6404944d1f3eb0.tar.xz cuberite-7d0fc85d0079febec4af110c4d6404944d1f3eb0.tar.zst cuberite-7d0fc85d0079febec4af110c4d6404944d1f3eb0.zip | |
Diffstat (limited to 'src/Entities/ItemFrame.cpp')
| -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); |