summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorp-mcgowan <mickeymcgowan@shaw.ca>2014-12-05 10:01:10 +0100
committerp-mcgowan <mickeymcgowan@shaw.ca>2014-12-05 10:01:10 +0100
commit750b4a3eaadab231cd215cbc8557ad67a67742cc (patch)
treec63baa22c4e3775489e63ba6d3bdb4f1a370b8cd
parentrestructure, with logic this time (diff)
downloadcuberite-750b4a3eaadab231cd215cbc8557ad67a67742cc.tar
cuberite-750b4a3eaadab231cd215cbc8557ad67a67742cc.tar.gz
cuberite-750b4a3eaadab231cd215cbc8557ad67a67742cc.tar.bz2
cuberite-750b4a3eaadab231cd215cbc8557ad67a67742cc.tar.lz
cuberite-750b4a3eaadab231cd215cbc8557ad67a67742cc.tar.xz
cuberite-750b4a3eaadab231cd215cbc8557ad67a67742cc.tar.zst
cuberite-750b4a3eaadab231cd215cbc8557ad67a67742cc.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/FinishGen.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 6788afca3..358ed16a1 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -1106,8 +1106,7 @@ eMonsterType cFinishGenPassiveMobs::GetRandomMob(cChunkDesc & a_ChunkDesc)
case biMushroomIsland:
case biMushroomShore:
{
- ListOfSpawnables.insert(MobIter, mtMooshroom);
- break;
+ return mtMooshroom;
}
// Add squid in ocean biomes
case biOcean:
@@ -1156,13 +1155,10 @@ eMonsterType cFinishGenPassiveMobs::GetRandomMob(cChunkDesc & a_ChunkDesc)
break;
}
}
- if ((a_ChunkDesc.GetBiome(x, z) != biMushroomIsland) && (a_ChunkDesc.GetBiome(x, z) != biMushroomShore))
- {
- ListOfSpawnables.insert(MobIter, mtChicken);
- ListOfSpawnables.insert(MobIter, mtCow);
- ListOfSpawnables.insert(MobIter, mtPig);
- ListOfSpawnables.insert(MobIter, mtSheep);
- }
+ ListOfSpawnables.insert(MobIter, mtChicken);
+ ListOfSpawnables.insert(MobIter, mtCow);
+ ListOfSpawnables.insert(MobIter, mtPig);
+ ListOfSpawnables.insert(MobIter, mtSheep);
if (ListOfSpawnables.empty())
{