mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-13 06:07:40 +01:00
68 lines
4.6 KiB
Diff
68 lines
4.6 KiB
Diff
--- a/net/minecraft/server/WorldProviderNormal.java
|
|
+++ b/net/minecraft/server/WorldProviderNormal.java
|
|
@@ -13,10 +13,14 @@
|
|
super(world, dimensionmanager, 0.0F);
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ /*
|
|
@Override
|
|
public DimensionManager getDimensionManager() {
|
|
return DimensionManager.OVERWORLD;
|
|
}
|
|
+ */
|
|
+ // CraftBukkit end
|
|
|
|
@Override
|
|
public ChunkGenerator<? extends GeneratorSettingsDefault> getChunkGenerator() {
|
|
@@ -34,16 +38,16 @@
|
|
GeneratorSettingsFlat generatorsettingsflat = GeneratorSettingsFlat.a(new Dynamic(DynamicOpsNBT.a, this.b.getWorldData().getGeneratorOptions()));
|
|
BiomeLayoutFixedConfiguration biomelayoutfixedconfiguration = ((BiomeLayoutFixedConfiguration) biomelayout.a(this.b.getWorldData())).a(generatorsettingsflat.v());
|
|
|
|
- return chunkgeneratortype.create(this.b, biomelayout.a((BiomeLayoutConfiguration) biomelayoutfixedconfiguration), generatorsettingsflat);
|
|
+ return chunkgeneratortype.create(this.b, biomelayout.a(biomelayoutfixedconfiguration), generatorsettingsflat); // CraftBukkit - decompile error
|
|
} else if (worldtype == WorldType.DEBUG_ALL_BLOCK_STATES) {
|
|
BiomeLayoutFixedConfiguration biomelayoutfixedconfiguration1 = ((BiomeLayoutFixedConfiguration) biomelayout.a(this.b.getWorldData())).a(Biomes.PLAINS);
|
|
|
|
- return chunkgeneratortype1.create(this.b, biomelayout.a((BiomeLayoutConfiguration) biomelayoutfixedconfiguration1), chunkgeneratortype1.a());
|
|
+ return chunkgeneratortype1.create(this.b, biomelayout.a(biomelayoutfixedconfiguration1), chunkgeneratortype1.a()); // CraftBukkit - decompile error
|
|
} else if (worldtype != WorldType.g) {
|
|
GeneratorSettingsOverworld generatorsettingsoverworld = (GeneratorSettingsOverworld) chunkgeneratortype4.a();
|
|
BiomeLayoutOverworldConfiguration biomelayoutoverworldconfiguration = ((BiomeLayoutOverworldConfiguration) biomelayout1.a(this.b.getWorldData())).a(generatorsettingsoverworld);
|
|
|
|
- return chunkgeneratortype4.create(this.b, biomelayout1.a((BiomeLayoutConfiguration) biomelayoutoverworldconfiguration), generatorsettingsoverworld);
|
|
+ return chunkgeneratortype4.create(this.b, biomelayout1.a(biomelayoutoverworldconfiguration), generatorsettingsoverworld); // CraftBukkit - decompile error
|
|
} else {
|
|
WorldChunkManager worldchunkmanager = null;
|
|
JsonElement jsonelement = (JsonElement) Dynamic.convert(DynamicOpsNBT.a, JsonOps.INSTANCE, this.b.getWorldData().getGeneratorOptions());
|
|
@@ -68,25 +72,25 @@
|
|
if (BiomeLayout.b == biomelayout3) {
|
|
BiomeLayoutFixedConfiguration biomelayoutfixedconfiguration2 = ((BiomeLayoutFixedConfiguration) biomelayout.a(this.b.getWorldData())).a(abiomebase[0]);
|
|
|
|
- worldchunkmanager = biomelayout.a((BiomeLayoutConfiguration) biomelayoutfixedconfiguration2);
|
|
+ worldchunkmanager = biomelayout.a(biomelayoutfixedconfiguration2); // CraftBukkit - decompile error
|
|
}
|
|
|
|
if (BiomeLayout.a == biomelayout3) {
|
|
int j = jsonobject2.has("size") ? jsonobject2.getAsJsonPrimitive("size").getAsInt() : 2;
|
|
BiomeLayoutCheckerboardConfiguration biomelayoutcheckerboardconfiguration = ((BiomeLayoutCheckerboardConfiguration) biomelayout2.a(this.b.getWorldData())).a(abiomebase).a(j);
|
|
|
|
- worldchunkmanager = biomelayout2.a((BiomeLayoutConfiguration) biomelayoutcheckerboardconfiguration);
|
|
+ worldchunkmanager = biomelayout2.a(biomelayoutcheckerboardconfiguration); // CraftBukkit - decompile error
|
|
}
|
|
|
|
if (BiomeLayout.c == biomelayout3) {
|
|
BiomeLayoutOverworldConfiguration biomelayoutoverworldconfiguration1 = (BiomeLayoutOverworldConfiguration) biomelayout1.a(this.b.getWorldData());
|
|
|
|
- worldchunkmanager = biomelayout1.a((BiomeLayoutConfiguration) biomelayoutoverworldconfiguration1);
|
|
+ worldchunkmanager = biomelayout1.a(biomelayoutoverworldconfiguration1); // CraftBukkit - decompile error
|
|
}
|
|
}
|
|
|
|
if (worldchunkmanager == null) {
|
|
- worldchunkmanager = biomelayout.a((BiomeLayoutConfiguration) ((BiomeLayoutFixedConfiguration) biomelayout.a(this.b.getWorldData())).a(Biomes.OCEAN));
|
|
+ worldchunkmanager = biomelayout.a(((BiomeLayoutFixedConfiguration) biomelayout.a(this.b.getWorldData())).a(Biomes.OCEAN)); // CraftBukkit - decompile error
|
|
}
|
|
|
|
IBlockData iblockdata = Blocks.STONE.getBlockData();
|