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

This commit is contained in:
Forstride 2017-04-22 11:27:33 -04:00
commit a902dd3a39
2 changed files with 6 additions and 1 deletions

View file

@ -1,4 +1,4 @@
minecraft_version=1.11.2
forge_version=13.20.0.2279
mod_version=6.0.2
mod_version=6.1.0
mappings_version=snapshot_nodoc_20170121

View file

@ -46,6 +46,7 @@ import net.minecraft.world.gen.*;
import net.minecraft.world.gen.feature.WorldGenDungeons;
import net.minecraft.world.gen.feature.WorldGenLakes;
import net.minecraft.world.gen.structure.*;
import net.minecraftforge.common.ForgeModContainer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.terraingen.PopulateChunkEvent;
import net.minecraftforge.event.terraingen.TerrainGen;
@ -471,6 +472,9 @@ public class ChunkProviderGenerateBOP implements IChunkGenerator
@Override
public void populate(int chunkX, int chunkZ)
{
boolean prevLogging = ForgeModContainer.logCascadingWorldGeneration;
ForgeModContainer.logCascadingWorldGeneration = false;
BlockFalling.fallInstantly = true;
int x = chunkX * 16;
int z = chunkZ * 16;
@ -587,6 +591,7 @@ public class ChunkProviderGenerateBOP implements IChunkGenerator
MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(this, world, rand, chunkX, chunkZ, hasVillageGenerated));
BlockFalling.fallInstantly = false;
ForgeModContainer.logCascadingWorldGeneration = prevLogging;
}
@Override