summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2014-01-27 22:02:19 +0100
committerSTRWarrior <niels.breuker@hotmail.nl>2014-01-27 22:02:19 +0100
commitbabc80ed777f2ee74ce770d95bd3ec5743370570 (patch)
tree3ae0e484d679acc57fc76c982c7f52268cef5f3c /src
parentVillager: Few more comments. (diff)
downloadcuberite-babc80ed777f2ee74ce770d95bd3ec5743370570.tar
cuberite-babc80ed777f2ee74ce770d95bd3ec5743370570.tar.gz
cuberite-babc80ed777f2ee74ce770d95bd3ec5743370570.tar.bz2
cuberite-babc80ed777f2ee74ce770d95bd3ec5743370570.tar.lz
cuberite-babc80ed777f2ee74ce770d95bd3ec5743370570.tar.xz
cuberite-babc80ed777f2ee74ce770d95bd3ec5743370570.tar.zst
cuberite-babc80ed777f2ee74ce770d95bd3ec5743370570.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/Villager.cpp10
-rw-r--r--src/World.cpp1
-rw-r--r--src/World.h3
3 files changed, 14 insertions, 0 deletions
diff --git a/src/Mobs/Villager.cpp b/src/Mobs/Villager.cpp
index 262f13a99..74a2a6d99 100644
--- a/src/Mobs/Villager.cpp
+++ b/src/Mobs/Villager.cpp
@@ -141,6 +141,11 @@ void cVillager::HandleFarmerAttemptSpecialAction()
void cVillager::HandleFarmerAction()
{
+ if (!m_World->VillagersShouldHarvestCrops())
+ {
+ return;
+ }
+
// Harvest the crops if the villager isn't moving and if the crops are closer then 2 blocks.
if (!m_bMovingToDestination && (GetPosition() - m_CropsPos).Length() < 2)
{
@@ -161,6 +166,11 @@ void cVillager::HandleFarmerAction()
void cVillager::HandleFarmerEndCountDown()
{
+ if (!m_World->VillagersShouldHarvestCrops())
+ {
+ return;
+ }
+
// Check if there is still farmland at the spot where the crops were.
if (m_World->GetBlock(m_CropsPos.x, m_CropsPos.y - 1, m_CropsPos.z) == E_BLOCK_FARMLAND)
{
diff --git a/src/World.cpp b/src/World.cpp
index 5205c2616..88bbf5f8a 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -547,6 +547,7 @@ void cWorld::Start(void)
m_IsDeepSnowEnabled = IniFile.GetValueSetB("Physics", "DeepSnow", false);
m_ShouldLavaSpawnFire = IniFile.GetValueSetB("Physics", "ShouldLavaSpawnFire", true);
m_bCommandBlocksEnabled = IniFile.GetValueSetB("Mechanics", "CommandBlocksEnabled", false);
+ m_VillagersShouldHarvestCrops = IniFile.GetValueSetB("Monsters", "VillagersShouldHarvestCrops", true);
m_GameMode = (eGameMode)IniFile.GetValueSetI("GameMode", "GameMode", m_GameMode);
diff --git a/src/World.h b/src/World.h
index d7a7241d1..4d5659ee6 100644
--- a/src/World.h
+++ b/src/World.h
@@ -138,6 +138,8 @@ public:
bool ShouldLavaSpawnFire(void) const { return m_ShouldLavaSpawnFire; }
+ bool VillagersShouldHarvestCrops(void) const { return m_VillagersShouldHarvestCrops; }
+
eDimension GetDimension(void) const { return m_Dimension; }
/** Returns the world height at the specified coords; waits for the chunk to get loaded / generated */
@@ -743,6 +745,7 @@ private:
bool m_bEnabledPVP;
bool m_IsDeepSnowEnabled;
bool m_ShouldLavaSpawnFire;
+ bool m_VillagersShouldHarvestCrops;
std::vector<BlockTickQueueItem *> m_BlockTickQueue;
std::vector<BlockTickQueueItem *> m_BlockTickQueueCopy; // Second is for safely removing the objects from the queue