summaryrefslogtreecommitdiffstats
path: root/api/logic/minecraft
diff options
context:
space:
mode:
Diffstat (limited to 'api/logic/minecraft')
-rw-r--r--api/logic/minecraft/ftb/OneSixFTBInstance.cpp7
-rw-r--r--api/logic/minecraft/ftb/OneSixFTBInstance.h2
2 files changed, 3 insertions, 6 deletions
diff --git a/api/logic/minecraft/ftb/OneSixFTBInstance.cpp b/api/logic/minecraft/ftb/OneSixFTBInstance.cpp
index 5edad080..edf31eb7 100644
--- a/api/logic/minecraft/ftb/OneSixFTBInstance.cpp
+++ b/api/logic/minecraft/ftb/OneSixFTBInstance.cpp
@@ -15,7 +15,7 @@ OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsO
m_globalSettings = globalSettings;
}
-void OneSixFTBInstance::copy(const QDir &newDir)
+void OneSixFTBInstance::copy(SettingsObjectPtr newSettings, const QDir &newDir)
{
QStringList libraryNames;
// create patch file
@@ -94,10 +94,7 @@ void OneSixFTBInstance::copy(const QDir &newDir)
}
}
// now set the target instance to be plain OneSix
- INISettingsObject settings_obj(newDir.absoluteFilePath("instance.cfg"));
- settings_obj.registerSetting("InstanceType", "Legacy");
- QString inst_type = settings_obj.get("InstanceType").toString();
- settings_obj.set("InstanceType", "OneSix");
+ newSettings->set("InstanceType", "OneSix");
}
QString OneSixFTBInstance::id() const
diff --git a/api/logic/minecraft/ftb/OneSixFTBInstance.h b/api/logic/minecraft/ftb/OneSixFTBInstance.h
index a5621685..640f609c 100644
--- a/api/logic/minecraft/ftb/OneSixFTBInstance.h
+++ b/api/logic/minecraft/ftb/OneSixFTBInstance.h
@@ -9,7 +9,7 @@ public:
explicit OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
virtual ~OneSixFTBInstance(){};
- void copy(const QDir &newDir) override;
+ void copy(SettingsObjectPtr newSettings, const QDir &newDir) override;
virtual void createProfile() override;