Add -game and -dispatch startup arguments that override the run m…

…ode in the config
Grasscutters · Sep 19, 2022 · a90455a · a90455a
1 parent 0d64e2e
commit a90455a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -56,6 +56,7 @@ public final class Grasscutter {
     private static Language language;
 
     public static final File configFile = new File("./config.json");
+    @Setter private static ServerRunMode runModeOverride = null; // Config override for run mode
 
     private static int day; // Current day of week.
     @Getter @Setter private static String preferredLanguage;
@@ -141,7 +142,7 @@ public static void main(String[] args) throws Exception {
         httpServer.addRouter(DocumentationServerHandler.class);
 
         // Start servers.
-        var runMode = SERVER.runMode;
+        var runMode = Grasscutter.getRunMode();
         if (runMode == ServerRunMode.HYBRID) {
             httpServer.start();
             gameServer.start();
@@ -245,6 +246,10 @@ public static void setLanguage(Language language) {
     public static Language getLanguage(String langCode) {
         return Language.getLanguage(langCode);
     }
+
+    public static ServerRunMode getRunMode() {
+        return Grasscutter.runModeOverride != null ? Grasscutter.runModeOverride : SERVER.runMode;
+    }
 
     public static Logger getLogger() {
         return log;

diff --git a/src/main/java/emu/grasscutter/utils/StartupArguments.java b/src/main/java/emu/grasscutter/utils/StartupArguments.java
@@ -4,6 +4,7 @@
 import ch.qos.logback.classic.Logger;
 import emu.grasscutter.BuildConfig;
 import emu.grasscutter.Grasscutter;
+import emu.grasscutter.Grasscutter.ServerRunMode;
 import emu.grasscutter.net.packet.PacketOpcodesUtils;
 import io.javalin.core.util.JavalinLogger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +29,10 @@ private StartupArguments() {
         "-debug", StartupArguments::enableDebug,
         "-lang", parameter -> {
             Grasscutter.setPreferredLanguage(parameter); return false;
+        },"-game", parameter -> {
+            Grasscutter.setRunModeOverride(ServerRunMode.GAME_ONLY); return false;
+        },"-dispatch", parameter -> {
+            Grasscutter.setRunModeOverride(ServerRunMode.DISPATCH_ONLY); return false;
         },
 
         // Aliases.