diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-05-21 22:38:31 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-05-21 22:38:31 +0200 |
| commit | 29ce36c7bc2238cfed55eb81d439f030072beaad (patch) | |
| tree | 8caaa6246ad171019eb50dbd584052981bbc5854 /logic/minecraft | |
| parent | 22a0294a330dfcf8a50654d1eb17e07c2eab89dc (diff) | |
| download | MultiMC-29ce36c7bc2238cfed55eb81d439f030072beaad.tar MultiMC-29ce36c7bc2238cfed55eb81d439f030072beaad.tar.gz MultiMC-29ce36c7bc2238cfed55eb81d439f030072beaad.tar.lz MultiMC-29ce36c7bc2238cfed55eb81d439f030072beaad.tar.xz MultiMC-29ce36c7bc2238cfed55eb81d439f030072beaad.zip | |
GH-983 use 'minecraft.jar' for ancient jar-modded versions
Fixes NEI in MC 1.4.7 and probably other obscure issues
Diffstat (limited to 'logic/minecraft')
| -rw-r--r-- | logic/minecraft/OneSixInstance.cpp | 2 | ||||
| -rw-r--r-- | logic/minecraft/OneSixUpdate.cpp | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp index e9989f2e..8e2d1043 100644 --- a/logic/minecraft/OneSixInstance.cpp +++ b/logic/minecraft/OneSixInstance.cpp @@ -144,7 +144,7 @@ BaseProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session) auto jarMods = getJarMods(); if (!jarMods.isEmpty()) { - launchScript += "cp " + QDir(instanceRoot()).absoluteFilePath("temp.jar") + "\n"; + launchScript += "cp " + QDir(instanceRoot()).absoluteFilePath("minecraft.jar") + "\n"; } else { diff --git a/logic/minecraft/OneSixUpdate.cpp b/logic/minecraft/OneSixUpdate.cpp index 2177cf33..24ee5804 100644 --- a/logic/minecraft/OneSixUpdate.cpp +++ b/logic/minecraft/OneSixUpdate.cpp @@ -303,7 +303,13 @@ void OneSixUpdate::jarlibFinished() { strippedJar.remove(); } - auto finalJarPath = QDir(m_inst->instanceRoot()).absoluteFilePath("temp.jar"); + auto tempJarPath = QDir(m_inst->instanceRoot()).absoluteFilePath("temp.jar"); + QFile tempJar(tempJarPath); + if(tempJar.exists()) + { + tempJar.remove(); + } + auto finalJarPath = QDir(m_inst->instanceRoot()).absoluteFilePath("minecraft.jar"); QFile finalJar(finalJarPath); if(finalJar.exists()) { |