From ac4086856b285456c25b5736b1fbfffec810d412 Mon Sep 17 00:00:00 2001
From: dima_dencep <dima_dencep@constructlegacy.ru>
Date: Sun, 2 Jul 2023 12:39:52 +0700
Subject: [PATCH] Direct main class

---
 .../gravit/launcher/server/commands/SetupCommand.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ServerWrapper/src/main/java/pro/gravit/launcher/server/commands/SetupCommand.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/commands/SetupCommand.java
index 1179dafb..af5c738c 100644
--- a/ServerWrapper/src/main/java/pro/gravit/launcher/server/commands/SetupCommand.java
+++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/commands/SetupCommand.java
@@ -43,33 +43,30 @@ public void invoke(String... args) throws Exception {
         String jarName = this.wrapper.commandHandler.readLine();
         Path jarPath = Paths.get(jarName);
 
-        String mainClassName;
         String agentClassName;
 
         try (JarFile file = new JarFile(jarPath.toFile())) {
             LogHelper.info("Check server jar MainClass");
-            mainClassName = file.getManifest().getMainAttributes().getValue("Main-Class");
+            this.wrapper.config.mainclass = file.getManifest().getMainAttributes().getValue("Main-Class");
             agentClassName = file.getManifest().getMainAttributes().getValue("Premain-Class");
 
-            if (mainClassName == null) {
+            if (this.wrapper.config.mainclass == null) {
                 LogHelper.error("Main-Class not found in MANIFEST");
                 return;
             }
 
             try {
-                Class.forName(mainClassName, false, new PublicURLClassLoader(new URL[] { jarPath.toUri().toURL() }));
+                Class.forName(this.wrapper.config.mainclass, false, new PublicURLClassLoader(new URL[] { jarPath.toUri().toURL() }));
             } catch (ClassNotFoundException e) {
                 LogHelper.error(e);
                 return;
             }
         }
 
-        LogHelper.info("Found MainClass %s", mainClassName);
+        LogHelper.info("Found MainClass %s", this.wrapper.config.mainclass);
         if (agentClassName != null)
             LogHelper.info("Found PremainClass %s", agentClassName);
 
-        this.wrapper.config.mainclass = mainClassName;
-
         for (int i = 0; i < 10; ++i) {
             if(!Request.isAvailable() || Request.getRequestService().isClosed()) {
                 LogHelper.info("Print websocket address (ws://host:port/api):");