9
0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-23 08:39:19 +00:00

fix: exception when reading server defaults

This commit is contained in:
William
2024-01-26 14:55:09 +00:00
parent 267cf1ff35
commit fa7f6f0d6e

View File

@@ -20,17 +20,13 @@
package net.william278.husksync.config;
import de.exlll.configlib.Configuration;
import de.exlll.configlib.YamlConfigurations;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.stream.Stream;
@Getter
@Configuration
@@ -59,17 +55,7 @@ public class Server {
@NotNull
private static String getDefault() {
final String serverFolder = System.getProperty("user.dir");
return serverFolder == null ? "server" : Stream
.of("HuskHomes", "HuskTowns", "HuskClaims")
.map(s -> Paths.get(serverFolder, "plugins", s, "server.yml").toFile())
.filter(File::exists).findFirst()
.map(file -> YamlConfigurations.load(
file.toPath(),
Server.class,
ConfigProvider.YAML_CONFIGURATION_PROPERTIES.header(CONFIG_HEADER).build()
))
.map(Server::getName)
.orElse(Path.of(serverFolder).getFileName().toString().trim());
return serverFolder == null ? "server" : Path.of(serverFolder).getFileName().toString().trim();
}
@Override