Projects >> MinecraftForge >>72ad8bcde186ec37c698dd8870aaacba2d431fae

Chunk
Conflicting content
    /**
     * Generate some world
     * 
<<<<<<< HEAD
     * @param random the chunk specific {@link Random}.
=======
     * @param random the chunk specific {@link Random} as built in {@link FMLBukkitHandler#onChunkPopulate(net.minecraft.src.IChunkProvider, int, int, net.minecraft.src.World, net.minecraft.src.IChunkProvider)}.
>>>>>>> 6ae8a2d5b9e3b7a13d00b37096d8222dde002bc1
     * @param chunkX the block X coordinate of this chunk.
     * @param chunkZ the block Z coordinate of this chunk.
     * @param world : additionalData[0] The minecraft {@link World} we're generating for.
Solution content
    /**
     * Generate some world
     * 
     * @param random the chunk specific {@link Random}.
     * @param chunkX the block X coordinate of this chunk.
     * @param chunkZ the block Z coordinate of this chunk.
     * @param world : additionalData[0] The minecraft {@link World} we're generating for.
File
IWorldGenerator.java
Developer's decision
Version 1
Kind of conflict
Comment