ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'unmojang/fix-1.16-offline' into develop

Browse Source
This commit is contained in:
Evan Goode 2024-05-03 17:31:39 -04:00
commit d0550e998d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/minecraft/MinecraftInstance.cpp
View File

@ -569,6 +569,14 @@ QStringList MinecraftInstance::processAuthArgs(AuthSessionPtr session) const
break; break;
} }
} }
} else if (session->wants_online && (v == "1.16.4" || v == "1.16.5")) {
// https://github.com/FabricMC/fabric-loom/issues/915#issuecomment-1609154390
QString invalid_url{ "https://invalid.invalid" };
args << "-Dminecraft.api.env=custom";
args << "-Dminecraft.api.auth.host=" + invalid_url;
args << "-Dminecraft.api.account.host=" + invalid_url;
args << "-Dminecraft.api.session.host=" + invalid_url;
args << "-Dminecraft.api.services.host=" + invalid_url;
} }
return args; return args;
} }

1
launcher/minecraft/auth/AuthSession.cpp
View File

@ -27,6 +27,7 @@ bool AuthSession::MakeOffline(QString offline_playername)
access_token = "0"; access_token = "0";
player_name = offline_playername; player_name = offline_playername;
status = PlayableOffline; status = PlayableOffline;
wants_online = false;
return true; return true;
} }

4
launcher/minecraft/launch/LauncherPartLaunch.cpp
View File

@ -117,9 +117,9 @@ void LauncherPartLaunch::executeTask()
} }
m_launchScript = minecraftInstance->createLaunchScript(m_session, m_serverToJoin); m_launchScript = minecraftInstance->createLaunchScript(m_session, m_serverToJoin);
QStringList args = minecraftInstance->javaArguments();
args.append(minecraftInstance->processAuthArgs(m_session)); auto args = minecraftInstance->processAuthArgs(m_session);
args.append(minecraftInstance->javaArguments());
QString allArgs = args.join(", "); QString allArgs = args.join(", ");
emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::Launcher); emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::Launcher);