From f29e78557a5db8d42f050526f9a608e54c545059 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 5 Feb 2023 14:11:59 -0800 Subject: [PATCH] Change location of seed world data. Fixes #2087 --- .../java/world/bentobox/bentobox/managers/AddonsManager.java | 2 +- .../java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java index 4e1fae590..70bbfce93 100644 --- a/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java @@ -350,7 +350,7 @@ public class AddonsManager { private void seedWorld(GameModeAddon gameMode, @NonNull World world) { // Use the Flat type of world because this is a copy and no vanilla creation is required - WorldCreator wc = WorldCreator.name("seeds/" + world.getName()).type(WorldType.FLAT).environment(world.getEnvironment()); + WorldCreator wc = WorldCreator.name(world.getName() + "/bentobox").type(WorldType.FLAT).environment(world.getEnvironment()); World w = gameMode.getWorldSettings().isUseOwnGenerator() ? wc.createWorld() : wc.generator(world.getGenerator()).createWorld(); w.setDifficulty(Difficulty.PEACEFUL); } diff --git a/src/main/java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java b/src/main/java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java index c98f1d085..c6a3f67b1 100644 --- a/src/main/java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java +++ b/src/main/java/world/bentobox/bentobox/nms/CopyWorldRegenerator.java @@ -42,7 +42,6 @@ import world.bentobox.bentobox.database.objects.IslandDeletion; * */ public abstract class CopyWorldRegenerator implements WorldRegenerator { - private static final String SEEDS = "seeds/"; private final BentoBox plugin; protected CopyWorldRegenerator() { @@ -133,7 +132,7 @@ public abstract class CopyWorldRegenerator implements WorldRegenerator { } private CompletableFuture getSeedWorldChunk(World world, int chunkX, int chunkZ) { - World seed = Bukkit.getWorld(SEEDS + world.getName()); + World seed = Bukkit.getWorld(world.getName() + "/bentobox"); if (seed == null) return CompletableFuture.completedFuture(null); return PaperLib.getChunkAtAsync(seed, chunkX, chunkZ); }