From f30daab0f75087009054eef86cf31fc39c4e77fe Mon Sep 17 00:00:00 2001 From: Gravita Date: Wed, 10 Nov 2021 23:32:26 +0700 Subject: [PATCH] [FIX] Proguard jdk dir specified twice --- .../pro/gravit/launchserver/components/ProGuardComponent.java | 1 + .../java/pro/gravit/launchserver/manangers/SessionManager.java | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java index 3fe10d7c..a28b65d3 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java @@ -144,6 +144,7 @@ public Path process(Path inputFile) throws IOException { logger.debug("JMods resolved in {}", jfxPath.toString()); } else { logger.error("JavaFX jmods not found. May be install OpenJFX?"); + jfxPath = null; } ConfigurationParser parser = new ConfigurationParser(proguardConf.buildConfig(inputFile, outputJar, jfxPath == null ? new Path[0] : new Path[]{jfxPath}), proguardConf.proguard.toFile(), System.getProperties()); diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/SessionManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/SessionManager.java index a4f6a951..7be2f9ef 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/SessionManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/SessionManager.java @@ -56,9 +56,6 @@ private Client restoreFromString(byte[] data) { return result; } - public void garbageCollection() { - } - public Client getClient(UUID session) { if (session == null) return null;