summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-01-25 22:36:47 +0100
committerMattes D <github@xoft.cz>2014-01-25 22:36:47 +0100
commit5749b40422f03df93b56f8244ca90570417752e6 (patch)
treea7f46d3fae2a2aeb338e09694f28bd217d29e34e
parentMerge pull request #587 from mc-server/mobimprovements (diff)
parentImplemented sheeps eating grass. (diff)
downloadcuberite-5749b40422f03df93b56f8244ca90570417752e6.tar
cuberite-5749b40422f03df93b56f8244ca90570417752e6.tar.gz
cuberite-5749b40422f03df93b56f8244ca90570417752e6.tar.bz2
cuberite-5749b40422f03df93b56f8244ca90570417752e6.tar.lz
cuberite-5749b40422f03df93b56f8244ca90570417752e6.tar.xz
cuberite-5749b40422f03df93b56f8244ca90570417752e6.tar.zst
cuberite-5749b40422f03df93b56f8244ca90570417752e6.zip
-rw-r--r--src/Mobs/Sheep.cpp39
-rw-r--r--src/Mobs/Sheep.h3
2 files changed, 41 insertions, 1 deletions
diff --git a/src/Mobs/Sheep.cpp b/src/Mobs/Sheep.cpp
index bda4ccff8..702108ae4 100644
--- a/src/Mobs/Sheep.cpp
+++ b/src/Mobs/Sheep.cpp
@@ -13,7 +13,8 @@
cSheep::cSheep(int a_Color) :
super("Sheep", mtSheep, "mob.sheep.say", "mob.sheep.say", 0.6, 1.3),
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);
}
}
+
+
+
+
+
+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;
+ }
+ }
+ }
+}
diff --git a/src/Mobs/Sheep.h b/src/Mobs/Sheep.h
index 8293a2c05..4eee3db1c 100644
--- a/src/Mobs/Sheep.h
+++ b/src/Mobs/Sheep.h
@@ -19,6 +19,8 @@ public:
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) 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; }
int GetFurColor(void) const { return m_WoolColor; }
@@ -26,6 +28,7 @@ private:
bool m_IsSheared;
int m_WoolColor;
+ int m_TimeToStopEating;
} ;