Skip to content

Commit a27b218

Browse files
authored
Merge pull request #3481 from Multiverse/fix/load-world-migration
Fix folder detection during 26.1 migration at world load
2 parents e4f3b46 + 97d4f6c commit a27b218

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

src/main/java/org/mvplugins/multiverse/core/world/helpers/WorldFolderResolver.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,12 @@ public static File resolve(@NotNull WorldKeyOrName keyOrName) {
5555
@ApiStatus.AvailableSince("5.7")
5656
@NotNull
5757
public static File resolve(@NotNull MultiverseWorld multiverseWorld) {
58-
return BukkitCompatibility.isUsingNewDimensionStorage()
59-
? resolveAsDimensionKey(multiverseWorld.getKey())
60-
: resolveAsLegacyWorldName(multiverseWorld.getName());
58+
File dimensionKey = resolveAsDimensionKey(multiverseWorld.getKey());
59+
File legacy = resolveAsLegacyWorldName(multiverseWorld.getName());
60+
if (BukkitCompatibility.isUsingNewDimensionStorage()) {
61+
return !dimensionKey.isDirectory() && legacy.isDirectory() ? legacy : dimensionKey;
62+
}
63+
return legacy;
6164
}
6265

6366
/**

0 commit comments

Comments
 (0)