Mirror/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-12-13 07:34:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix launch server from args

Browse Source
This commit is contained in:
Thoronium
2023-04-22 16:05:22 -06:00
parent 6ac0182784
commit c21c5ac0b1
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src-tauri/src/main.rs
View File

@@ -110,11 +110,19 @@ async fn parse_args(inp: &Vec<String>) -> Result<Args, ArgsError> {
if args.value_of("server")? { if args.value_of("server")? {
let server_jar = config.grasscutter_path; let server_jar = config.grasscutter_path;
let mut server_path = server_jar.clone();
// Assumes grasscutter jar is named appropriately // Assumes grasscutter jar is named appropriately
let server_path = server_jar.trim_end_matches("grasscutter.jar"); if server_path.contains('/') {
// Can never panic because of if
let len = server_jar.rfind('/').unwrap();
server_path.truncate(len);
} else if server_path.contains('\\') {
let len = server_jar.rfind('\\').unwrap();
server_path.truncate(len);
}
let java_path = config.java_path; let java_path = config.java_path;
system_helpers::run_jar(server_jar.clone(), server_path.to_string(), java_path); system_helpers::run_jar(server_jar, server_path.to_string(), java_path);
} }
if args.value_of::<String>("host").is_ok() && !args.value_of::<String>("host")?.is_empty() { if args.value_of::<String>("host").is_ok() && !args.value_of::<String>("host")?.is_empty() {