From 36fe263ede4e7b3d7341b703f73fbf88e164fa26 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sun, 16 Jun 2024 00:04:42 -0400 Subject: [PATCH] Revert servers.txt Change --- docs/CHANGELOG.md | 1 - launcher/src/bootstrap.cpp | 4 +++- mods/src/multiplayer/multiplayer.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e6ce50d2..2815c257 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -33,7 +33,6 @@ * Add Splash Text To Start Screen * `overwrite_calls` Now Scans VTables * Unify Server/Client Builds -* Use `|` For Separator In `servers.txt` Instead Of `:` **2.5.3** * Add `Replace Block Highlight With Outline` Feature Flag (Enabled By Default) diff --git a/launcher/src/bootstrap.cpp b/launcher/src/bootstrap.cpp index ebecaaa6..d529c3b3 100644 --- a/launcher/src/bootstrap.cpp +++ b/launcher/src/bootstrap.cpp @@ -72,7 +72,9 @@ void bootstrap() { DEBUG("Binary Directory: %s", binary_directory.c_str()); // Copy SDK - copy_sdk(binary_directory, true); + if (!reborn_is_server()) { + copy_sdk(binary_directory, true); + } // Set MCPI_REBORN_ASSETS_PATH { diff --git a/mods/src/multiplayer/multiplayer.cpp b/mods/src/multiplayer/multiplayer.cpp index 11d543e8..f5d9e1a2 100644 --- a/mods/src/multiplayer/multiplayer.cpp +++ b/mods/src/multiplayer/multiplayer.cpp @@ -55,7 +55,7 @@ static void load_servers() { // Parse std::string address; std::string port_str; - size_t separator_pos = line.find_last_of('|'); + size_t separator_pos = line.find_last_of(':'); if (separator_pos == std::string::npos) { port_str = "19132"; address = line;