Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MacOS ARM bug #154

Merged
merged 1 commit into from
Jun 8, 2024
+5 −3
Merged

Fix MacOS ARM bug #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,12 +422,14 @@

if (flag)
{
var rootLibs = GetNatives(inherits[i]!.Libraries);

var inheritsLibs = inherits[i]!.Libraries.ToList();
inheritsLibs = NativeReplaceHelper.Replace([rawVersion, ..inherits ?? []], inheritsLibs, NativeReplacementPolicy);

var rootLibs = GetNatives([.. inheritsLibs]);
result.Libraries = rootLibs.Item2;
result.Natives = rootLibs.Item1;

jvmArgList.AddRange(ParseJvmArguments(inherits[i]!.Arguments?.Jvm));

Check failure on line 432 in ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp) 

Dereference of a possibly null reference.

Check failure on line 432 in ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp) 

Dereference of a possibly null reference.

Check failure on line 432 in ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp) 

Dereference of a possibly null reference.

Check failure on line 432 in ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs

View workflow job for this annotation

GitHub Actions / Test build on ubuntu-latest .NET 8.0 

Dereference of a possibly null reference.

Check failure on line 432 in ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs

View workflow job for this annotation

GitHub Actions / Test build on ubuntu-latest .NET 8.0 

Dereference of a possibly null reference.

Check failure on line 432 in ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs

View workflow job for this annotation

GitHub Actions / Test build on macOS-latest .NET 8.0 

Dereference of a possibly null reference.

Check failure on line 432 in ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs

View workflow job for this annotation

GitHub Actions / Test build on macOS-latest .NET 8.0 

Dereference of a possibly null reference.

var rootArgs =
ParseGameArguments(
Expand Down Expand Up @@ -607,4 +609,4 @@
LauncherProfileParser.LauncherProfile.Profiles!.Add(gameId, gameProfile);
LauncherProfileParser.SaveProfile();
}
}
}
Loading