diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-05-24 02:41:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 02:41:54 +0200 |
| commit | 60b686f01458fc1f31109a0be71d790b8f7ec22b (patch) | |
| tree | b6a7d10a24517a5971a712e949c7a9c340f56e0c /api/logic/minecraft/legacy | |
| parent | 3a8068e75f4f818417f17c524af928ba295e775a (diff) | |
| parent | 52c1150522139f042903321387c6582a99e8ad9a (diff) | |
| download | PrismLauncher-60b686f01458fc1f31109a0be71d790b8f7ec22b.tar.gz PrismLauncher-60b686f01458fc1f31109a0be71d790b8f7ec22b.tar.bz2 PrismLauncher-60b686f01458fc1f31109a0be71d790b8f7ec22b.zip | |
Merge pull request #3804 from Janrupf/feature/default-server
Add ability to select a server to join in the instance settings
Diffstat (limited to 'api/logic/minecraft/legacy')
| -rw-r--r-- | api/logic/minecraft/legacy/LegacyInstance.cpp | 2 | ||||
| -rw-r--r-- | api/logic/minecraft/legacy/LegacyInstance.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/api/logic/minecraft/legacy/LegacyInstance.cpp b/api/logic/minecraft/legacy/LegacyInstance.cpp index f86e5d05..9f9bda5a 100644 --- a/api/logic/minecraft/legacy/LegacyInstance.cpp +++ b/api/logic/minecraft/legacy/LegacyInstance.cpp @@ -225,7 +225,7 @@ QString LegacyInstance::getStatusbarDescription() return tr("Instance from previous versions."); } -QStringList LegacyInstance::verboseDescription(AuthSessionPtr session) +QStringList LegacyInstance::verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) { QStringList out; diff --git a/api/logic/minecraft/legacy/LegacyInstance.h b/api/logic/minecraft/legacy/LegacyInstance.h index 9caddcba..325bac7a 100644 --- a/api/logic/minecraft/legacy/LegacyInstance.h +++ b/api/logic/minecraft/legacy/LegacyInstance.h @@ -111,7 +111,8 @@ public: { return false; } - shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account) override + shared_qobject_ptr<LaunchTask> createLaunchTask( + AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) override { return nullptr; } @@ -125,7 +126,7 @@ public: } QString getStatusbarDescription() override; - QStringList verboseDescription(AuthSessionPtr session) override; + QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) override; QProcessEnvironment createEnvironment() override { |