Merge branch 'BOP-1.8.9-3.0.x' of https://github.com/Glitchfiend/BiomesOPlenty into BOP-1.8.9-3.0.x

This commit is contained in:
Forstride 2016-02-08 20:26:39 -05:00
commit cda6c12bba

View file

@ -70,6 +70,7 @@ public class GenLayerShoreBOP extends BOPGenLayer
{
if (biomeId != BiomeGenBase.ocean.biomeID && biomeId != BiomeGenBase.deepOcean.biomeID && biomeId != BiomeGenBase.river.biomeID && biomeId != BiomeGenBase.swampland.biomeID)
{
//Generate custom beaches for our biomes
if (biome != null && biome instanceof BOPBiome)
{
BOPBiome bopBiome = (BOPBiome)biome;
@ -131,23 +132,6 @@ public class GenLayerShoreBOP extends BOPGenLayer
}
}
private boolean getRiver(int biomeId)
{
//Check if the biome id is valid
if (biomeId >= 0 && biomeId < BiomeGenBase.getBiomeGenArray().length)
{
BiomeGenBase biome = BiomeGenBase.getBiome(biomeId);
if (biome != null && biome instanceof BOPBiome)
{
BOPBiome bopBiome = (BOPBiome)biome;
return bopBiome.canGenerateRivers;
}
}
return true;
}
private static final Predicate<Integer> OCEAN_PREDICATE = new Predicate<Integer>()
{
@Override