Fix CraftWorld identifier passing

Author: kennytv

paper-server/patches/sources/net/minecraft/world/level/Level.java.patch

@@ -90,7 +90,7 @@
 +        this.spigotConfig = new org.spigotmc.SpigotWorldConfig(bukkitName, CraftNamespacedKey.fromMinecraft(dimension.identifier())); // Spigot
 +        this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
 +        this.generator = generator;
-+        this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment);
++        this.world = new CraftWorld((ServerLevel) this, dimension.identifier(), biomeProvider, environment);
 +
 +        for (SpawnCategory spawnCategory : SpawnCategory.values()) {
 +            if (org.bukkit.craftbukkit.util.CraftSpawnCategory.isValidForLimits(spawnCategory)) {

paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java

@@ -170,21 +170,20 @@ public class CraftWorld extends CraftRegionAccessor implements World {
         .resolving(net.kyori.adventure.identity.Identity.UUID, World::getUID)
         .build();
 
-    private final ServerLevel world;
-    private WorldBorder worldBorder;
-    private Environment environment;
     private final CraftServer server = (CraftServer) Bukkit.getServer();
-    private final @Nullable ChunkGenerator generator;
     private final @Nullable BiomeProvider biomeProvider;
     private final List<BlockPopulator> populators = new ArrayList<>();
     private final BlockMetadataStore blockMetadata = new BlockMetadataStore(this);
     private final Object2IntOpenHashMap<SpawnCategory> spawnCategoryLimit = new Object2IntOpenHashMap<>();
     private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftWorld.DATA_TYPE_REGISTRY);
+    private final ServerLevel world;
+    private final NamespacedKey key;
+    private final Environment environment;
+    private WorldBorder worldBorder;
     // Paper start - void damage configuration
     private boolean voidDamageEnabled;
     private float voidDamageAmount;
     private double voidDamageMinBuildHeightOffset;
-    private final NamespacedKey key;
 
     @Override
     public boolean isVoidDamageEnabled() {
@@ -297,10 +296,9 @@ public boolean hasStructureAt(final io.papermc.paper.math.Position position, fin
 
     private static final Random rand = new Random();
 
-    public CraftWorld(ServerLevel world, @Nullable ChunkGenerator generator, @Nullable BiomeProvider biomeProvider, Environment environment) {
+    public CraftWorld(ServerLevel world, Identifier identifier, @Nullable BiomeProvider biomeProvider, Environment environment) {
         this.world = world;
-        this.key = CraftNamespacedKey.fromMinecraft(this.world.dimension().identifier());
-        this.generator = generator;
+        this.key = CraftNamespacedKey.fromMinecraft(identifier);
         this.biomeProvider = biomeProvider;
 
         this.environment = environment;
@@ -875,7 +873,7 @@ public boolean createExplosion(Location loc, float power, boolean setFire, boole
 
     @Override
     public @Nullable ChunkGenerator getGenerator() {
-        return this.generator;
+        return this.world.generator;
     }
 
     @Override