From 858b490c74d4b560923b1b3896735d0a42c78991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 10 Jan 2017 23:03:00 +0100 Subject: GH-1778: Fix placement of modded Minecraft.jar in OneSix instances. --- api/logic/minecraft/legacy/LegacyInstance.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'api/logic/minecraft/legacy/LegacyInstance.cpp') 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 -- cgit v1.2.3