flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Tailored death messages

Browse Source
This commit is contained in:
Tiger Wang
2014-07-04 10:55:09 +01:00
parent 39fff19955
commit a0d2df9327
20 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/ItemFrame.cpp
View File

@@ -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);