CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1778: Fix placement of modded Minecraft.jar in OneSix instances.

Browse Source
This commit is contained in:
Petr Mrázek
2017-01-10 23:03:00 +01:00
parent 12c3683ec0
commit 858b490c74
7 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/logic/minecraft/onesix/OneSixInstance.cpp
View File

@ -156,7 +156,7 @@ QString OneSixInstance::mainJarPath() const
auto jarMods = getJarMods();
if (!jarMods.isEmpty())
{
return QDir(instanceRoot()).absoluteFilePath("minecraft.jar");
return QDir(binRoot()).absoluteFilePath("minecraft.jar");
}
else
{
@ -392,7 +392,11 @@ std::shared_ptr<Task> OneSixInstance::createJarModdingTask()
{
tempJar.remove();
}
auto finalJarPath = QDir(m_inst->instanceRoot()).absoluteFilePath("minecraft.jar");
if(!FS::ensureFolderPathExists(m_inst->binRoot()))
{
emitFailed(tr("Couldn't create the bin folder for Minecraft.jar"));
}
auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
QFile finalJar(finalJarPath);
if(finalJar.exists())
{