summaryrefslogtreecommitdiffstats
path: root/api/logic/minecraft/legacy/LegacyInstance.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-01-10 23:03:00 +0100
committerPetr Mrázek <peterix@gmail.com>2017-01-10 23:03:00 +0100
commit858b490c74d4b560923b1b3896735d0a42c78991 (patch)
treea423f01a3e38cf75a26cab99da23228086cd9281 /api/logic/minecraft/legacy/LegacyInstance.cpp
parent12c3683ec07788bf4be03221b0232b4eae27caba (diff)
downloadMultiMC-858b490c74d4b560923b1b3896735d0a42c78991.tar
MultiMC-858b490c74d4b560923b1b3896735d0a42c78991.tar.gz
MultiMC-858b490c74d4b560923b1b3896735d0a42c78991.tar.lz
MultiMC-858b490c74d4b560923b1b3896735d0a42c78991.tar.xz
MultiMC-858b490c74d4b560923b1b3896735d0a42c78991.zip
GH-1778: Fix placement of modded Minecraft.jar in OneSix instances.
Diffstat (limited to 'api/logic/minecraft/legacy/LegacyInstance.cpp')
-rw-r--r--api/logic/minecraft/legacy/LegacyInstance.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/api/logic/minecraft/legacy/LegacyInstance.cpp b/api/logic/minecraft/legacy/LegacyInstance.cpp
index 85de559c..0987d56f 100644
--- a/api/logic/minecraft/legacy/LegacyInstance.cpp
+++ b/api/logic/minecraft/legacy/LegacyInstance.cpp
@@ -291,11 +291,6 @@ QString LegacyInstance::jarModsDir() const
return FS::PathCombine(instanceRoot(), "instMods");
}
-QString LegacyInstance::binDir() const
-{
- return FS::PathCombine(minecraftRoot(), "bin");
-}
-
QString LegacyInstance::libDir() const
{
return FS::PathCombine(minecraftRoot(), "lib");
@@ -327,7 +322,7 @@ QString LegacyInstance::texturePacksDir() const
QString LegacyInstance::runnableJar() const
{
- return FS::PathCombine(binDir(), "minecraft.jar");
+ return FS::PathCombine(binRoot(), "minecraft.jar");
}
QString LegacyInstance::modListFile() const
@@ -399,7 +394,7 @@ QString LegacyInstance::defaultBaseJar() const
QString LegacyInstance::defaultCustomBaseJar() const
{
- return FS::PathCombine(binDir(), "mcbackup.jar");
+ return FS::PathCombine(binRoot(), "mcbackup.jar");
}
QString LegacyInstance::lwjglFolder() const