diff options
| author | flow <thiagodonato300@gmail.com> | 2022-02-25 13:43:27 -0300 |
|---|---|---|
| committer | flow <thiagodonato300@gmail.com> | 2022-02-25 13:43:27 -0300 |
| commit | c4f4e9e620ee4a7094542190bc18cc167d00a7ff (patch) | |
| tree | ddb23a5782c2388eb59c02d72c0478c94dbdf6f9 /launcher/InstanceList.cpp | |
| parent | 40a9828fbab0e9a8b7f070714bdd87d3f279e18c (diff) | |
| parent | f2b850ad200b1b871402c4d4bb2676f1e1288d3d (diff) | |
| download | PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.tar.gz PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.tar.bz2 PrismLauncher-c4f4e9e620ee4a7094542190bc18cc167d00a7ff.zip | |
merge upstream and resolve conflicts
Diffstat (limited to 'launcher/InstanceList.cpp')
| -rw-r--r-- | launcher/InstanceList.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp index ad18740b..04b86f6b 100644 --- a/launcher/InstanceList.cpp +++ b/launcher/InstanceList.cpp @@ -32,7 +32,6 @@ #include "BaseInstance.h" #include "InstanceTask.h" #include "settings/INISettingsObject.h" -#include "minecraft/legacy/LegacyInstance.h" #include "NullInstance.h" #include "minecraft/MinecraftInstance.h" #include "FileSystem.h" @@ -545,7 +544,7 @@ InstancePtr InstanceList::loadInstance(const InstanceId& id) auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(instanceRoot, "instance.cfg")); InstancePtr inst; - instanceSettings->registerSetting("InstanceType", "Legacy"); + instanceSettings->registerSetting("InstanceType", "Legacy"); // intentionally Legacy. We don't support it. QString inst_type = instanceSettings->get("InstanceType").toString(); @@ -553,10 +552,6 @@ InstancePtr InstanceList::loadInstance(const InstanceId& id) { inst.reset(new MinecraftInstance(m_globalSettings, instanceSettings, instanceRoot)); } - else if (inst_type == "Legacy") - { - inst.reset(new LegacyInstance(m_globalSettings, instanceSettings, instanceRoot)); - } else { inst.reset(new NullInstance(m_globalSettings, instanceSettings, instanceRoot)); |