Fix crash when running server from root directory

Fixes #9498
This commit is contained in:
SizableShrimp committed 2023-05-14 15:26:24 -05:00
1 parent 2ab2ced589
commit f1702495ef
5 files changed
+47 -27

No files matched your search

@@ -7,6 +7,8 @@ package net.minecraftforge.server;
import static net.minecraftforge.fml.Logging.CORE;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
@@ -35,7 +37,6 @@ import net.minecraftforge.fml.ModLoadingStage;
import net.minecraftforge.fml.ModLoadingWarning;
import net.minecraftforge.network.ConnectionType;
import net.minecraftforge.network.NetworkConstants;
import net.minecraftforge.network.ServerStatusPing;
import net.minecraftforge.network.NetworkHooks;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.forgespi.locating.IModFile;
@@ -62,7 +63,6 @@ import net.minecraftforge.event.server.ServerStartedEvent;
import net.minecraftforge.event.server.ServerStartingEvent;
import net.minecraftforge.event.server.ServerStoppedEvent;
import net.minecraftforge.event.server.ServerStoppingEvent;
import net.minecraftforge.fml.loading.FileUtils;
import net.minecraftforge.forgespi.language.IModInfo;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.GameData;
@@ -79,7 +79,13 @@ public class ServerLifecycleHooks
private static Path getServerConfigPath(final MinecraftServer server)
{
final Path serverConfig = server.getWorldPath(SERVERCONFIG);
FileUtils.getOrCreateDirectory(serverConfig, "serverconfig");
if (!Files.isDirectory(serverConfig)) {
try {
Files.createDirectories(serverConfig);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
return serverConfig;
}