summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorp-mcgowan <mickeymcgowan@shaw.ca>2014-12-05 20:31:01 +0100
committerp-mcgowan <mickeymcgowan@shaw.ca>2014-12-05 20:31:01 +0100
commitb25fcb0972554facbd4dfd79cb256a77a2cb6773 (patch)
tree0b27506ae222a3cf1dfe9b54d16f6edb672de199
parentMerge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisher (diff)
downloadcuberite-b25fcb0972554facbd4dfd79cb256a77a2cb6773.tar
cuberite-b25fcb0972554facbd4dfd79cb256a77a2cb6773.tar.gz
cuberite-b25fcb0972554facbd4dfd79cb256a77a2cb6773.tar.bz2
cuberite-b25fcb0972554facbd4dfd79cb256a77a2cb6773.tar.lz
cuberite-b25fcb0972554facbd4dfd79cb256a77a2cb6773.tar.xz
cuberite-b25fcb0972554facbd4dfd79cb256a77a2cb6773.tar.zst
cuberite-b25fcb0972554facbd4dfd79cb256a77a2cb6773.zip
-rw-r--r--src/Generating/FinishGen.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 41dbdca16..ad3dc5293 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -993,6 +993,7 @@ cFinishGenPassiveMobs::cFinishGenPassiveMobs(int a_Seed, cIniFile & a_IniFile, e
if ((m_AnimalProbability < 0) || (m_AnimalProbability > 100))
{
LOGWARNING("[Animals]: AnimalSpawnChunkPercentage is invalid, using the default of \"%d\".", DefaultAnimalSpawnChunkPercentage);
+ m_AnimalProbability = DefaultAnimalSpawnChunkPercentage;
}
}
@@ -1052,7 +1053,7 @@ bool cFinishGenPassiveMobs::TrySpawnAnimals(cChunkDesc & a_ChunkDesc, int a_RelX
BLOCKTYPE BlockUnderFeet = a_ChunkDesc.GetBlockType(a_RelX, a_RelY - 1, a_RelZ);
// Check block below (opaque, grass, water), and above (air)
- if (AnimalToSpawn == mtSquid && BlockAtFeet != E_BLOCK_WATER)
+ if ((AnimalToSpawn == mtSquid) && (BlockAtFeet != E_BLOCK_WATER))
{
return false;
}