Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-10 20:59:54 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-5573, SPIGOT-5574: Move CustomChunkGenerator generation code back to buildBase()

Browse Source
This commit is contained in:
konsolas 2020-02-12 17:58:50 +00:00 committed by md_5
parent d171d7eb8e
commit 37f32da8f8
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
View File

@ -99,11 +99,6 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
// Don't allow the server to override any custom biomes that have been set
}
@Override
public void buildBase(RegionLimitedWorldAccess regionlimitedworldaccess, IChunkAccess ichunkaccess) {
// Disable vanilla generation
}
@Override
public <C extends WorldGenFeatureConfiguration> C getFeatureConfiguration(BiomeBase biomebase, StructureGenerator<C> structuregenerator) {
return (C) delegate.getFeatureConfiguration(biomebase, structuregenerator);
@ -125,7 +120,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
}
@Override
public void createStructures(BiomeManager biomemanager, IChunkAccess ichunkaccess, net.minecraft.server.ChunkGenerator<?> chunkgenerator, DefinedStructureManager definedstructuremanager) {
public void buildBase(RegionLimitedWorldAccess regionlimitedworldaccess, IChunkAccess ichunkaccess) {
// Call the bukkit ChunkGenerator before structure generation so correct biome information is available.
int x = ichunkaccess.getPos().x;
int z = ichunkaccess.getPos().z;
@ -176,23 +171,14 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
}
}
}
}
@Override
public void createStructures(BiomeManager biomemanager, IChunkAccess ichunkaccess, net.minecraft.server.ChunkGenerator<?> chunkgenerator, DefinedStructureManager definedstructuremanager) {
if (generator.shouldGenerateStructures()) {
// Vanilla only uses biome at block 9 (see createStructures).
// We don't use BiomeGrid as another aspect of generation may try and get from a chunk somewhere else.
final BiomeBase biome = biomegrid.biome.getBiome(9 >> 2, 0, 9 >> 2);
delegate.createStructures(new BiomeManager(null, 0, null) {
@Override
public BiomeManager a(WorldChunkManager worldchunkmanager) {
return this;
}
@Override
public BiomeBase a(BlockPosition blockposition) {
return biome;
}
}, ichunkaccess, chunkgenerator, definedstructuremanager);
// Still need a way of getting the biome of this chunk to pass to createStructures
// Using default biomes for now.
delegate.createStructures(biomemanager, ichunkaccess, chunkgenerator, definedstructuremanager);
}
}