--- a/net/minecraft/world/level/levelgen/ChunkProviderFlat.java
+++ b/net/minecraft/world/level/levelgen/ChunkProviderFlat.java
@@ -35,10 +35,16 @@
     private final GeneratorSettingsFlat settings;
 
     public ChunkProviderFlat(GeneratorSettingsFlat generatorsettingsflat) {
-        WorldChunkManagerHell worldchunkmanagerhell = new WorldChunkManagerHell(generatorsettingsflat.getBiome());
+        // CraftBukkit start
+        // WorldChunkManagerHell worldchunkmanagerhell = new WorldChunkManagerHell(generatorsettingsflat.getBiome());
 
-        Objects.requireNonNull(generatorsettingsflat);
-        super(worldchunkmanagerhell, SystemUtils.memoize(generatorsettingsflat::adjustGenerationSettings));
+        // Objects.requireNonNull(generatorsettingsflat);
+        this(generatorsettingsflat, new WorldChunkManagerHell(generatorsettingsflat.getBiome()));
+    }
+
+    public ChunkProviderFlat(GeneratorSettingsFlat generatorsettingsflat, net.minecraft.world.level.biome.WorldChunkManager worldchunkmanager) {
+        super(worldchunkmanager, SystemUtils.memoize(generatorsettingsflat::adjustGenerationSettings));
+        // CraftBukkit end
         this.settings = generatorsettingsflat;
     }