diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-03-10 18:17:28 +0100 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-03-10 18:17:28 +0100 |
commit | 0a509ab85e395bf46e29b7b554d736fadfaed0ba (patch) | |
tree | f67665e089d372b89505f1b9a3ee21c8cd9f0d8c /src/Mobs | |
parent | Be more parinoid about int sizes (diff) | |
parent | Fixed MSVC2008 compilation. (diff) | |
download | cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar.gz cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar.bz2 cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar.lz cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar.xz cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar.zst cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Mobs/Sheep.cpp | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/Mobs/Sheep.cpp b/src/Mobs/Sheep.cpp index 4761103e5..c64360153 100644 --- a/src/Mobs/Sheep.cpp +++ b/src/Mobs/Sheep.cpp @@ -68,17 +68,28 @@ void cSheep::OnRightClicked(cPlayer & a_Player) void cSheep::Tick(float a_Dt, cChunk & a_Chunk) { - // The sheep should not move when he's eating so only handle the physics. + super::Tick(a_Dt, a_Chunk); + int PosX = POSX_TOINT; + int PosY = POSY_TOINT - 1; + int PosZ = POSZ_TOINT; + + if ((PosY <= 0) || (PosY > cChunkDef::Height)) + { + return; + } + if (m_TimeToStopEating > 0) { - HandlePhysics(a_Dt, a_Chunk); + m_bMovingToDestination = false; // The sheep should not move when he's eating m_TimeToStopEating--; + if (m_TimeToStopEating == 0) { - if (m_World->GetBlock((int) GetPosX(), (int) GetPosY() - 1, (int) GetPosZ()) == E_BLOCK_GRASS) + if (m_World->GetBlock(PosX, PosY, PosZ) == E_BLOCK_GRASS) // Make sure grass hasn't been destroyed in the meantime { - // 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); + // The sheep ate the grass so we change it to dirt + m_World->SetBlock(PosX, PosY, PosZ, E_BLOCK_DIRT, 0); + GetWorld()->BroadcastSoundParticleEffect(2001, PosX, PosY, PosX, E_BLOCK_GRASS); m_IsSheared = false; m_World->BroadcastEntityMetadata(*this); } @@ -86,12 +97,11 @@ void cSheep::Tick(float a_Dt, cChunk & a_Chunk) } 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) + if (m_World->GetBlock(PosX, PosY, PosZ) == E_BLOCK_GRASS) { - m_World->BroadcastEntityStatus(*this, 10); + m_World->BroadcastEntityStatus(*this, ENTITY_STATUS_SHEEP_EATING); m_TimeToStopEating = 40; } } |