1
0

Merge pull request #588 from mc-server/Sheep_Eating

Implemented sheeps eating grass.
This commit is contained in:
Mattes D 2014-01-25 13:36:47 -08:00
commit 5749b40422
2 changed files with 41 additions and 1 deletions

View File

@ -13,7 +13,8 @@
cSheep::cSheep(int a_Color) : cSheep::cSheep(int a_Color) :
super("Sheep", mtSheep, "mob.sheep.say", "mob.sheep.say", 0.6, 1.3), super("Sheep", mtSheep, "mob.sheep.say", "mob.sheep.say", 0.6, 1.3),
m_IsSheared(false), m_IsSheared(false),
m_WoolColor(a_Color) m_WoolColor(a_Color),
m_TimeToStopEating(-1)
{ {
} }
@ -60,3 +61,39 @@ void cSheep::OnRightClicked(cPlayer & a_Player)
m_World->BroadcastEntityMetadata(*this); m_World->BroadcastEntityMetadata(*this);
} }
} }
void cSheep::Tick(float a_Dt, cChunk & a_Chunk)
{
// The sheep should not move when he's eating so only handle the physics.
if (m_TimeToStopEating > 0)
{
HandlePhysics(a_Dt, a_Chunk);
m_TimeToStopEating--;
if (m_TimeToStopEating == 0)
{
if (m_World->GetBlock((int) GetPosX(), (int) GetPosY() - 1, (int) GetPosZ()) == E_BLOCK_GRASS)
{
// The sheep ate the grass so we change it to dirt.
m_World->SetBlock((int) GetPosX(), (int) GetPosY() - 1, (int) GetPosZ(), E_BLOCK_DIRT, 0);
m_IsSheared = false;
m_World->BroadcastEntityMetadata(*this);
}
}
}
else
{
super::Tick(a_Dt, a_Chunk);
if (m_World->GetTickRandomNumber(600) == 1)
{
if (m_World->GetBlock((int) GetPosX(), (int) GetPosY() - 1, (int) GetPosZ()) == E_BLOCK_GRASS)
{
m_World->BroadcastEntityStatus(*this, 10);
m_TimeToStopEating = 40;
}
}
}
}

View File

@ -19,6 +19,8 @@ public:
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
virtual void OnRightClicked(cPlayer & a_Player) override; virtual void OnRightClicked(cPlayer & a_Player) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
bool IsSheared(void) const { return m_IsSheared; } bool IsSheared(void) const { return m_IsSheared; }
int GetFurColor(void) const { return m_WoolColor; } int GetFurColor(void) const { return m_WoolColor; }
@ -26,6 +28,7 @@ private:
bool m_IsSheared; bool m_IsSheared;
int m_WoolColor; int m_WoolColor;
int m_TimeToStopEating;
} ; } ;