Skip to content

Commit 980a014

Browse files
committed
fix: When looking for the installers, ignore everything that isn't a JAR-file.
1 parent 0c006ba commit 980a014

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CurseForge.Minecraft.Serverpack.Launcher/FabricMethods.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ partial class Program
99
{
1010
private static async Task InstallFabricAsync(string installPath, string minecraftVersion, string loaderVersion, string javaArgs, bool startServer)
1111
{
12-
var fabricInstaller = Directory.EnumerateFiles(installPath).FirstOrDefault(f => f.Contains("fabric-installer-"));
12+
var fabricInstaller = Directory.EnumerateFiles(installPath).FirstOrDefault(f => f.Contains("fabric-installer-") && f.EndsWith(".jar"));
1313
if (fabricInstaller == null)
1414
{
1515
throw new Exception("Couldn't find the installer, bailing out");

CurseForge.Minecraft.Serverpack.Launcher/ForgeMethods.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ partial class Program
99
{
1010
private static async Task InstallForgeAsync(string installPath, string javaArgs, bool startServer)
1111
{
12-
var forgeInstaller = Directory.EnumerateFiles(installPath).FirstOrDefault(f => f.Contains("forge-") && f.Contains("-installer.jar"));
12+
var forgeInstaller = Directory.EnumerateFiles(installPath).FirstOrDefault(f => f.Contains("forge-") && f.Contains("-installer.jar") && f.EndsWith(".jar"));
1313
if (forgeInstaller == null)
1414
{
1515
throw new Exception("Couldn't find the installer, bailing out");
@@ -22,7 +22,7 @@ private static async Task InstallForgeAsync(string installPath, string javaArgs,
2222

2323
await RunProcessAsync(installPath, GetJavaExecutable(), false, arguments);
2424

25-
var forgeLoader = Directory.EnumerateFiles(installPath, "*.jar", SearchOption.AllDirectories).FirstOrDefault(f => f.Contains("forge-") && !f.Contains("-installer.jar"));
25+
var forgeLoader = Directory.EnumerateFiles(installPath, "*.jar", SearchOption.AllDirectories).FirstOrDefault(f => f.Contains("forge-") && !f.Contains("-installer.jar") && f.EndsWith(".jar"));
2626

2727
if (forgeLoader == null)
2828
{

0 commit comments

Comments
 (0)