From a5f687fd76849319733b4f58478c19e461576260 Mon Sep 17 00:00:00 2001 From: CrazyDev22 Date: Fri, 26 Apr 2024 18:14:40 +0200 Subject: [PATCH] fix ServerConfigurator --- .../volmit/iris/core/ServerConfigurator.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java index d9e715f0e..3ba977ea8 100644 --- a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java +++ b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java @@ -69,7 +69,7 @@ public class ServerConfigurator { } private static void increaseKeepAliveSpigot() throws IOException, InvalidConfigurationException { - File spigotConfig = new File("config/spigot.yml"); + File spigotConfig = new File("spigot.yml"); FileConfiguration f = new YamlConfiguration(); f.load(spigotConfig); long tt = f.getLong("settings.timeout-time"); @@ -101,16 +101,27 @@ public class ServerConfigurator { } KList worlds = new KList<>(); Bukkit.getServer().getWorlds().forEach(w -> worlds.add(new File(w.getWorldFolder(), "datapacks"))); + if (worlds.isEmpty()) { + worlds.add(new File(getMainWorldFolder(), "datapacks")); + } return worlds; } - private static boolean postVerifyDataPacks(boolean fast) { + private static File getMainWorldFolder() { try { Properties prop = new Properties(); prop.load(new FileInputStream("server.properties")); String world = prop.getProperty("level-name"); - File worldFolder = new File(Bukkit.getWorldContainer(), world); - File datapacksFolder = new File(worldFolder, "datapacks"); + return new File(Bukkit.getWorldContainer(), world); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + private static boolean postVerifyDataPacks(boolean fast) { + try { + File datapacksFolder = new File(getMainWorldFolder(), "datapacks"); File IrisDatapacks = new File(datapacksFolder, "iris"); if (!datapacksFolder.exists() || !IrisDatapacks.exists()) { return (true);