Skip to content

fix: only attach Java agent for injected server quick play #7300

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

Open
sarpedondev wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −15
Open

fix: only attach Java agent for injected server quick play #7300

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
47 changes: 32 additions & 15 deletions packages/app-lib/src/launcher/args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ pub fn get_jvm_arguments(
ipc_addr: SocketAddr,
) -> crate::Result<Vec<String>> {
let mut parsed_arguments = Vec::new();
let injected_quick_play_server =
injected_quick_play_server(quick_play_type, quick_play_version);

if let Some(args) = arguments {
parse_arguments(
Expand Down Expand Up @@ -168,18 +170,20 @@ pub fn get_jvm_arguments(
parsed_arguments.push(argument.replace("${path}", &full_path));
}

parsed_arguments.push(format!(
"-javaagent:{}",
canonicalize(agent_path)
.map_err(|_| {
crate::ErrorKind::LauncherError(format!(
"Specified Java Agent path {} does not exist",
libraries_path.to_string_lossy()
))
.as_error()
})?
.to_string_lossy()
));
if injected_quick_play_server.is_some() {
parsed_arguments.push(format!(
"-javaagent:{}",
canonicalize(agent_path)
.map_err(|_| {
crate::ErrorKind::LauncherError(format!(
"Specified Java Agent path {} does not exist",
libraries_path.to_string_lossy()
))
.as_error()
})?
.to_string_lossy()
));
}

parsed_arguments
.push(format!("-Dmodrinth.internal.ipc.host={}", ipc_addr.ip()));
Expand All @@ -192,9 +196,7 @@ pub fn get_jvm_arguments(
.as_str()
.unwrap()
));
if let QuickPlayType::Server(server) = quick_play_type
&& quick_play_version.server == QuickPlayServerVersion::Injected
{
if let Some(server) = injected_quick_play_server {
let (host, port) = server.require_resolved()?;
parsed_arguments.extend_from_slice(&[
format!("-Dmodrinth.internal.quickPlay.host={host}"),
Expand All @@ -211,6 +213,21 @@ pub fn get_jvm_arguments(
Ok(parsed_arguments)
}

fn injected_quick_play_server(
quick_play_type: &QuickPlayType,
quick_play_version: QuickPlayVersion,
) -> Option<&crate::server_address::ServerAddress> {
match quick_play_type {
QuickPlayType::Server(server)
if quick_play_version.server
== QuickPlayServerVersion::Injected =>
{
Some(server)
}
_ => None,
}
}

fn parse_jvm_argument(
mut argument: String,
natives_path: &Path,
Expand Down