diff options
| author | p-mcgowan <mickeymcgowan@shaw.ca> | 2014-12-05 20:24:09 +0100 |
|---|---|---|
| committer | p-mcgowan <mickeymcgowan@shaw.ca> | 2014-12-05 20:24:09 +0100 |
| commit | a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d (patch) | |
| tree | 8c1fa6af38d8997f0cc935b62362245373b5db86 /src/MobSpawner.cpp | |
| parent | reformat (diff) | |
| parent | CheckBasicStyle: Check missing braces for control statements. (diff) | |
| download | cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar.gz cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar.bz2 cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar.lz cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar.xz cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar.zst cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.zip | |
Diffstat (limited to 'src/MobSpawner.cpp')
| -rw-r--r-- | src/MobSpawner.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/MobSpawner.cpp b/src/MobSpawner.cpp index a1d375e9e..ee9e569a7 100644 --- a/src/MobSpawner.cpp +++ b/src/MobSpawner.cpp @@ -61,7 +61,7 @@ eMonsterType cMobSpawner::ChooseMobType(EMCSBiome a_Biome) { std::set<eMonsterType> allowedMobs; - if (a_Biome == biMushroomIsland || a_Biome == biMushroomShore) + if ((a_Biome == biMushroomIsland) || (a_Biome == biMushroomShore)) { addIfAllowed(mtMooshroom, allowedMobs); } @@ -84,7 +84,7 @@ eMonsterType cMobSpawner::ChooseMobType(EMCSBiome a_Biome) addIfAllowed(mtCreeper, allowedMobs); addIfAllowed(mtSquid, allowedMobs); - if (a_Biome != biDesert && a_Biome != biBeach && a_Biome != biOcean) + if ((a_Biome != biDesert) && (a_Biome != biBeach) && (a_Biome != biOcean)) { addIfAllowed(mtSheep, allowedMobs); addIfAllowed(mtPig, allowedMobs); @@ -93,11 +93,11 @@ eMonsterType cMobSpawner::ChooseMobType(EMCSBiome a_Biome) addIfAllowed(mtEnderman, allowedMobs); addIfAllowed(mtSlime, allowedMobs); // MG TODO : much more complicated rule - if (a_Biome == biForest || a_Biome == biForestHills || a_Biome == biTaiga || a_Biome == biTaigaHills) + if ((a_Biome == biForest) || (a_Biome == biForestHills) || (a_Biome == biTaiga) || (a_Biome == biTaigaHills)) { addIfAllowed(mtWolf, allowedMobs); } - else if (a_Biome == biJungle || a_Biome == biJungleHills) + else if ((a_Biome == biJungle) || (a_Biome == biJungleHills)) { addIfAllowed(mtOcelot, allowedMobs); } @@ -285,6 +285,19 @@ bool cMobSpawner::CanSpawnHere(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_R ) ); } + + case mtMooshroom: + { + return ( + (TargetBlock == E_BLOCK_AIR) && + (BlockAbove == E_BLOCK_AIR) && + (BlockBelow == E_BLOCK_MYCELIUM) && + ( + (a_Biome == biMushroomShore) || + (a_Biome == biMushroomIsland) + ) + ); + } default: { |