From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 api/logic/InstanceCreationTask.cpp | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'api/logic/InstanceCreationTask.cpp')

diff --git a/api/logic/InstanceCreationTask.cpp b/api/logic/InstanceCreationTask.cpp
index 6dc2496c..978d4687 100644
--- a/api/logic/InstanceCreationTask.cpp
+++ b/api/logic/InstanceCreationTask.cpp
@@ -1,5 +1,4 @@
 #include "InstanceCreationTask.h"
-#include "BaseInstanceProvider.h"
 #include "settings/INISettingsObject.h"
 #include "FileSystem.h"
 
@@ -9,25 +8,24 @@
 
 InstanceCreationTask::InstanceCreationTask(BaseVersionPtr version)
 {
-	m_version = version;
+    m_version = version;
 }
 
 void InstanceCreationTask::executeTask()
 {
-	setStatus(tr("Creating instance from version %1").arg(m_version->name()));
-	{
-		auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(m_stagingPath, "instance.cfg"));
-		instanceSettings->suspendSave();
-		instanceSettings->registerSetting("InstanceType", "Legacy");
-		instanceSettings->set("InstanceType", "OneSix");
-		MinecraftInstance inst(m_globalSettings, instanceSettings, m_stagingPath);
-		auto components = inst.getComponentList();
-		components->buildingFromScratch();
-		components->setComponentVersion("net.minecraft", m_version->descriptor(), true);
-		inst.setName(m_instName);
-		inst.setIconKey(m_instIcon);
-		inst.init();
-		instanceSettings->resumeSave();
-	}
-	emitSucceeded();
+    setStatus(tr("Creating instance from version %1").arg(m_version->name()));
+    {
+        auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(m_stagingPath, "instance.cfg"));
+        instanceSettings->suspendSave();
+        instanceSettings->registerSetting("InstanceType", "Legacy");
+        instanceSettings->set("InstanceType", "OneSix");
+        MinecraftInstance inst(m_globalSettings, instanceSettings, m_stagingPath);
+        auto components = inst.getComponentList();
+        components->buildingFromScratch();
+        components->setComponentVersion("net.minecraft", m_version->descriptor(), true);
+        inst.setName(m_instName);
+        inst.setIconKey(m_instIcon);
+        instanceSettings->resumeSave();
+    }
+    emitSucceeded();
 }
-- 
cgit v1.2.3