diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java b/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java index c0d150d0..ec571b65 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java @@ -27,18 +27,17 @@ public class LauncherModuleLoader { public final List launcherModules = new ArrayList<>(); - public Path modules_dir; - private transient LaunchServer server; + public final Path modulesDir; + private final LaunchServer server; public LauncherModuleLoader(LaunchServer server) { - this.server = server; + this.server = server; modulesDir = server.dir.resolve("launcher-modules"); } public void init() { - modules_dir = server.dir.resolve("launcher-modules"); - if (!IOHelper.isDir(modules_dir)) { + if (!IOHelper.isDir(modulesDir)) { try { - Files.createDirectories(modules_dir); + Files.createDirectories(modulesDir); } catch (IOException e) { LogHelper.error(e); } @@ -67,7 +66,7 @@ public void init() { public void syncModules() throws IOException { launcherModules.clear(); - IOHelper.walk(modules_dir, new ModulesVisitor(), false); + IOHelper.walk(modulesDir, new ModulesVisitor(), false); } static class ModuleEntity { diff --git a/LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java index 753b572a..8d7d9455 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java @@ -602,7 +602,7 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOExce @Override public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { - Files.delete(dir); + if (!this.from.equals(dir)) Files.delete(dir); return FileVisitResult.CONTINUE; } }