From 505f5826dcad09484fa0bf9defb00fb7bf8c8cc8 Mon Sep 17 00:00:00 2001 From: dkrsk Date: Wed, 27 Apr 2022 20:02:25 +0300 Subject: [PATCH 1/2] Fix JVM memory arg creation --- CmlLib/Core/Launcher/MLaunch.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CmlLib/Core/Launcher/MLaunch.cs b/CmlLib/Core/Launcher/MLaunch.cs index 9ee0ab8..47aa8b2 100644 --- a/CmlLib/Core/Launcher/MLaunch.cs +++ b/CmlLib/Core/Launcher/MLaunch.cs @@ -111,19 +111,21 @@ public string[] CreateArg() // version-specific jvm arguments if (version.JvmArguments != null) args.AddRange(Mapper.MapInterpolation(version.JvmArguments, argDict)); - + // default jvm arguments if (launchOption.JVMArguments != null) args.AddRange(launchOption.JVMArguments); + else + args.AddRange(DefaultJavaParameter); + + if (args.Where(arg => arg.StartsWith("-Xm")).ToArray().Length == 0) { if (launchOption.MaximumRamMb > 0) args.Add("-Xmx" + launchOption.MaximumRamMb + "m"); if (launchOption.MinimumRamMb > 0) args.Add("-Xms" + launchOption.MinimumRamMb + "m"); - - args.AddRange(DefaultJavaParameter); } if (version.JvmArguments == null) From ef2e0cce161346df2d50670f4bff2c3e28baf7f4 Mon Sep 17 00:00:00 2001 From: dkrsk Date: Thu, 28 Apr 2022 18:06:37 +0300 Subject: [PATCH 2/2] make it better --- CmlLib/Core/Launcher/MLaunch.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CmlLib/Core/Launcher/MLaunch.cs b/CmlLib/Core/Launcher/MLaunch.cs index 47aa8b2..09f0693 100644 --- a/CmlLib/Core/Launcher/MLaunch.cs +++ b/CmlLib/Core/Launcher/MLaunch.cs @@ -119,7 +119,7 @@ public string[] CreateArg() else args.AddRange(DefaultJavaParameter); - if (args.Where(arg => arg.StartsWith("-Xm")).ToArray().Length == 0) + if (!args.Where(arg => arg.StartsWith("-Xm")).Any()) { if (launchOption.MaximumRamMb > 0) args.Add("-Xmx" + launchOption.MaximumRamMb + "m");