Merge branch 'feature_yggdrasil' into develop
Conflicts: gui/MainWindow.cpp logic/OneSixInstance.h Fix missing session id functionality for legacy and old onesix.
This commit is contained in:
commit
82225a21e1
24 changed files with 1849 additions and 132 deletions
|
@ -50,7 +50,7 @@ Task *LegacyInstance::doUpdate()
|
|||
return new LegacyUpdate(this, this);
|
||||
}
|
||||
|
||||
MinecraftProcess *LegacyInstance::prepareForLaunch(LoginResponse response)
|
||||
MinecraftProcess *LegacyInstance::prepareForLaunch(MojangAccountPtr account)
|
||||
{
|
||||
MinecraftProcess *proc = new MinecraftProcess(this);
|
||||
|
||||
|
@ -103,8 +103,8 @@ MinecraftProcess *LegacyInstance::prepareForLaunch(LoginResponse response)
|
|||
#endif
|
||||
|
||||
args << "-jar" << LAUNCHER_FILE;
|
||||
args << response.player_name;
|
||||
args << response.session_id;
|
||||
args << account->currentProfile()->name();
|
||||
args << account->sessionId();
|
||||
args << windowTitle;
|
||||
args << windowSize;
|
||||
args << lwjgl;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue