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

Paintings: add sound effects, remove critical hitting (#5276)

Browse Source
This commit is contained in:
Rorkh
2021-07-28 23:51:59 +03:00
committed by GitHub
parent 6a4460383e
commit 4221e08f3a
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Entities/Entity.cpp
View File

@@ -390,6 +390,18 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
return false;
}
if (IsPainting())
{
KilledBy(a_TDI);
if (a_TDI.Attacker != nullptr)
{
a_TDI.Attacker->Killed(this);
}
return true;
}
if ((a_TDI.Attacker != nullptr) && (a_TDI.Attacker->IsPlayer()))
{
cPlayer * Player = static_cast<cPlayer *>(a_TDI.Attacker);