Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-02-19 05:51:51 +01:00
Code Issues Projects Releases Wiki Activity

Fix adjust spawn not applying

Browse Source
This commit is contained in:
Ben Woo 2023-09-08 21:05:57 +08:00
parent 9c703ff329
commit cadb931d4c
No known key found for this signature in database
GPG Key ID: FB2A3645536E12C8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldManager.java
View File

@ -187,7 +187,7 @@ public class WorldManager {
replace("{error}").with(exception.getMessage()) replace("{error}").with(exception.getMessage())
), ),
(world) -> { (world) -> {
newMVWorld(world, parsedGenerator); newMVWorld(world, parsedGenerator, options.useSpawnAdjust());
return Result.success(CreateWorldResult.Success.CREATED, replace("{world}").with(world.getName())); return Result.success(CreateWorldResult.Success.CREATED, replace("{world}").with(world.getName()));
} }
); );
@ -224,7 +224,7 @@ public class WorldManager {
replace("{error}").with(exception.getMessage()) replace("{error}").with(exception.getMessage())
), ),
(world) -> { (world) -> {
newMVWorld(world, parsedGenerator); newMVWorld(world, parsedGenerator, options.useSpawnAdjust());
return Result.success(ImportWorldResult.Success.IMPORTED, replace("{world}").with(options.worldName())); return Result.success(ImportWorldResult.Success.IMPORTED, replace("{world}").with(options.worldName()));
} }
); );
@ -236,15 +236,16 @@ public class WorldManager {
: generator; : generator;
} }
private void newMVWorld(@NotNull World world, @Nullable String generator) { private void newMVWorld(@NotNull World world, @Nullable String generator, boolean adjustSpawn) {
WorldConfig worldConfig = worldsConfigManager.addWorldConfig(world.getName()); WorldConfig worldConfig = worldsConfigManager.addWorldConfig(world.getName());
worldConfig.setAdjustSpawn(adjustSpawn);
worldConfig.setGenerator(generator == null ? "" : generator);
OfflineWorld offlineWorld = new OfflineWorld(world.getName(), worldConfig); OfflineWorld offlineWorld = new OfflineWorld(world.getName(), worldConfig);
offlineWorldsMap.put(offlineWorld.getName(), offlineWorld); offlineWorldsMap.put(offlineWorld.getName(), offlineWorld);
MVWorld mvWorld = new MVWorld(world, worldConfig, blockSafety, safeTTeleporter, locationManipulation); MVWorld mvWorld = new MVWorld(world, worldConfig, blockSafety, safeTTeleporter, locationManipulation);
worldsMap.put(mvWorld.getName(), mvWorld); worldsMap.put(mvWorld.getName(), mvWorld);
mvWorld.getWorldConfig().setGenerator(generator == null ? "" : generator);
saveWorldsConfig(); saveWorldsConfig();
} }