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

Ocelots don't take fall damage (#4171)

Browse Source
This commit is contained in:
Bond-009 2018-02-04 21:53:35 +01:00 committed by Alexander Harkness
parent a28a93c9ca
commit d12804d4c0
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mobs/Chicken.cpp
View File

@ -74,10 +74,12 @@ void cChicken::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cChicken::HandleFalling(void)
bool cChicken::DoTakeDamage(TakeDamageInfo & a_TDI)
{
// empty - chickens don't take fall damage
if (a_TDI.DamageType == dtFalling)
{
return false;
}
return super::DoTakeDamage(a_TDI);
}

2
src/Mobs/Chicken.h
View File

@ -27,7 +27,7 @@ public:
a_Items.Add(E_ITEM_SEEDS);
}
virtual void HandleFalling(void) override;
virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
private:

10
src/Mobs/Ocelot.cpp
View File

@ -218,3 +218,13 @@ bool cOcelot::IsCatSittingOnBlock(cWorld * a_World, Vector3d a_BlockPosition)
bool cOcelot::DoTakeDamage(TakeDamageInfo & a_TDI)
{
if (a_TDI.DamageType == dtFalling)
{
return false;
}
return super::DoTakeDamage(a_TDI);
}

1
src/Mobs/Ocelot.h
View File

@ -35,6 +35,7 @@ public:
{
a_Items.Add(E_ITEM_RAW_FISH);
}
virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
// Get functions
bool IsSitting (void) const override { return m_IsSitting; }