aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/launch
diff options
context:
space:
mode:
authorhe3als <65787561+he3als@users.noreply.github.com>2022-10-22 15:30:40 +0100
committerGitHub <noreply@github.com>2022-10-22 15:30:40 +0100
commit89fd84d916b58cb7c82c94bcadc0834de8f5a039 (patch)
treefae8c646ca9b35bc2499a4c39787387686ae2a91 /launcher/minecraft/launch
parent92dfd659f1a3e11accdbf0ebbdc7cb91f74d9a21 (diff)
parent81f13052701dbec499ef65fe714f107a9b584ebf (diff)
downloadPrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.tar.gz
PrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.tar.bz2
PrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.zip
Merge branch 'PrismLauncher:develop' into develop
Diffstat (limited to 'launcher/minecraft/launch')
-rw-r--r--launcher/minecraft/launch/LauncherPartLaunch.cpp2
-rw-r--r--launcher/minecraft/launch/MinecraftServerTarget.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index ce477ad7..1d8d7083 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
@@ -154,7 +154,7 @@ void LauncherPartLaunch::executeTask()
#else
args << classPath.join(':');
#endif
- args << "org.polymc.EntryPoint";
+ args << "org.prismlauncher.EntryPoint";
qDebug() << args.join(' ');
diff --git a/launcher/minecraft/launch/MinecraftServerTarget.cpp b/launcher/minecraft/launch/MinecraftServerTarget.cpp
index 78a33359..a3383ec0 100644
--- a/launcher/minecraft/launch/MinecraftServerTarget.cpp
+++ b/launcher/minecraft/launch/MinecraftServerTarget.cpp
@@ -23,7 +23,7 @@ MinecraftServerTarget MinecraftServerTarget::parse(const QString &fullAddress) {
// The logic below replicates the exact logic minecraft uses for parsing server addresses.
// While the conversion is not lossless and eats errors, it ensures the same behavior
- // within Minecraft and PolyMC when entering server addresses.
+ // within Minecraft and Prism Launcher when entering server addresses.
if (fullAddress.startsWith("["))
{
int bracket = fullAddress.indexOf("]");