From c655d97c9db9408dc178f436baa87d894363ecb3 Mon Sep 17 00:00:00 2001
From: p-mcgowan <mickeymcgowan@shaw.ca>
Date: Fri, 5 Dec 2014 00:57:40 -0800
Subject: [PATCH] restructure, with logic this time

---
 src/Generating/FinishGen.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 97ee5a9f9..6788afca3 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -1117,6 +1117,7 @@ eMonsterType cFinishGenPassiveMobs::GetRandomMob(cChunkDesc & a_ChunkDesc)
 		case biDeepOcean:
 		{
 			ListOfSpawnables.insert(MobIter, mtSquid);
+			break;
 		}
 		// Add ocelots in jungle biomes
 		case biJungle:
@@ -1126,6 +1127,7 @@ eMonsterType cFinishGenPassiveMobs::GetRandomMob(cChunkDesc & a_ChunkDesc)
 		case biJungleEdgeM:
 		{
 			ListOfSpawnables.insert(MobIter, mtOcelot);
+			break;
 		}
 		case biPlains:
 		case biSunflowerPlains:
@@ -1136,6 +1138,7 @@ eMonsterType cFinishGenPassiveMobs::GetRandomMob(cChunkDesc & a_ChunkDesc)
 		{
 			ListOfSpawnables.insert(MobIter, mtHorse);
 			// ListOfSpawnables.insert(mtDonkey);
+			break;
 		}
 		// Add wolves in forest and spruce forests
 		case biForest:
@@ -1145,16 +1148,21 @@ eMonsterType cFinishGenPassiveMobs::GetRandomMob(cChunkDesc & a_ChunkDesc)
 		case biColdTaigaM:
 		{
 			ListOfSpawnables.insert(MobIter, mtWolf);
+			break;
 		}
-		// All other animals can be added to the list
+		// Nothing special about this biome
 		default:
 		{
-			ListOfSpawnables.insert(MobIter, mtChicken);
-			ListOfSpawnables.insert(MobIter, mtCow);
-			ListOfSpawnables.insert(MobIter, mtPig);
-			ListOfSpawnables.insert(MobIter, mtSheep);
+			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);
+	}
 
 	if (ListOfSpawnables.empty())
 	{