Skip to content

Commit 63b2ffd

Browse files
committed
Use bukkit world properties for difficulty, scale, and keep-spawn when create/import
1 parent 14d8ad7 commit 63b2ffd

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

src/main/java/org/mvplugins/multiverse/core/world/WorldManager.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -370,12 +370,20 @@ private MultiverseWorld newMultiverseWorld(String worldName, WorldConfig worldCo
370370
private LoadedMultiverseWorld newLoadedMultiverseWorld(
371371
@NotNull World world, @Nullable String generator, @Nullable String biome, boolean adjustSpawn) {
372372
WorldConfig worldConfig = worldsConfigManager.addWorldConfig(world.getName());
373+
374+
// Properties from multiverse input
373375
worldConfig.setAdjustSpawn(adjustSpawn);
374376
worldConfig.setGenerator(generator == null ? "" : generator);
375377
worldConfig.setBiome(biome == null ? "" : biome);
378+
379+
// Properties from the bukkit world
380+
worldConfig.setDifficulty(world.getDifficulty());
381+
worldConfig.setKeepSpawnInMemory(world.getKeepSpawnInMemory());
382+
worldConfig.setScale(world.getCoordinateScale());
383+
376384
worldConfig.save();
377385

378-
MultiverseWorld mvWorld = newMultiverseWorld(world.getName(), worldConfig);
386+
newMultiverseWorld(world.getName(), worldConfig);
379387
LoadedMultiverseWorld loadedWorld = new LoadedMultiverseWorld(
380388
world,
381389
worldConfig,
@@ -384,22 +392,12 @@ private LoadedMultiverseWorld newLoadedMultiverseWorld(
384392
locationManipulation,
385393
entityPurger
386394
);
387-
setDefaultEnvironmentScale(mvWorld);
388395
loadedWorldsMap.put(loadedWorld.getName(), loadedWorld);
389396
saveWorldsConfig();
390397
pluginManager.callEvent(new MVWorldLoadedEvent(loadedWorld));
391398
return loadedWorld;
392399
}
393400

394-
private void setDefaultEnvironmentScale(MultiverseWorld world) {
395-
double scale = switch (world.getEnvironment()) {
396-
case NETHER -> 8.0;
397-
case THE_END -> 16.0;
398-
default -> 1.0;
399-
};
400-
world.setScale(scale);
401-
}
402-
403401
/**
404402
* Loads an existing world in config.
405403
*

0 commit comments

Comments
 (0)