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

Villagers don't look for new crops when they already found one.

Browse Source 
Slight cleanup.
This commit is contained in:
STRWarrior 2014-01-27 17:20:39 +01:00
parent 89a620ca54
commit ca12decaf6
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mobs/Villager.cpp
View File

@ -40,24 +40,19 @@ void cVillager::DoTakeDamage(TakeDamageInfo & a_TDI)
void cVillager::Tick(float a_Dt, cChunk & a_Chunk) void cVillager::Tick(float a_Dt, cChunk & a_Chunk)
{ {
super::Tick(a_Dt, a_Chunk); super::Tick(a_Dt, a_Chunk);
if (m_DidFindCrops) if (m_DidFindCrops && !m_bMovingToDestination)
{ {
Vector3i Pos = Vector3i(GetPosition()); if ((GetPosition() - m_CropsPos).Length() < 2)
if (Pos.Equals(m_CropsPos))
{ {
BLOCKTYPE CropBlock = m_World->GetBlock(m_CropsPos.x, m_CropsPos.y, m_CropsPos.z); BLOCKTYPE CropBlock = m_World->GetBlock(m_CropsPos.x, m_CropsPos.y, m_CropsPos.z);
if (IsBlockFarmable(CropBlock) && m_World->GetBlockMeta(m_CropsPos.x, m_CropsPos.y, m_CropsPos.z) == 0x7) if (IsBlockFarmable(CropBlock) && m_World->GetBlockMeta(m_CropsPos.x, m_CropsPos.y, m_CropsPos.z) == 0x7)
{ {
cItems Pickups;
//Pickups.Add(E_ITEM_WHEAT, 1, 0);
//Pickups.Add(E_ITEM_SEEDS, 1 + m_World->GetTickRandomNumber(
cBlockHandler Handler(CropBlock); cBlockHandler Handler(CropBlock);
Handler.ConvertToPickups(Pickups, 0x7); Handler.DropBlock(m_World, this, m_CropsPos.x, m_CropsPos.y, m_CropsPos.z);
m_World->SpawnItemPickups(Pickups, m_CropsPos.x + 0.5, m_CropsPos.y + 0.5, m_CropsPos.z + 0.5);
m_World->SetBlock(m_CropsPos.x, m_CropsPos.y, m_CropsPos.z, E_BLOCK_AIR, 0); m_World->SetBlock(m_CropsPos.x, m_CropsPos.y, m_CropsPos.z, E_BLOCK_AIR, 0);
} }
m_DidFindCrops = false;
} }
m_DidFindCrops = false;
} }
if (m_World->GetTickRandomNumber(50) != 0) if (m_World->GetTickRandomNumber(50) != 0)
@ -68,11 +63,14 @@ void cVillager::Tick(float a_Dt, cChunk & a_Chunk)
switch (m_Type) switch (m_Type)
{ {
case vtFarmer: case vtFarmer:
{
if (!m_DidFindCrops)
{ {
HandleFarmer(); HandleFarmer();
} }
} }
} }
}
@ -106,7 +104,7 @@ void cVillager::HandleFarmer()
m_DidFindCrops = true; m_DidFindCrops = true;
m_CropsPos = Vector3i((int) GetPosX() + X - 5, (int) GetPosY() + Y - 3, (int) GetPosZ() + Z - 5); m_CropsPos = Vector3i((int) GetPosX() + X - 5, (int) GetPosY() + Y - 3, (int) GetPosZ() + Z - 5);
MoveToPosition(Vector3f((float) (m_CropsPos.x + 0.5), (float) (m_CropsPos.y), (float) (m_CropsPos.z + 0.5))); MoveToPosition(Vector3f((float) (m_CropsPos.x + 0.5), (float) m_CropsPos.y, (float) (m_CropsPos.z + 0.5)));
return; return;
} }
} }