monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minecraft client: prevent options.yaml/host.yaml contamination from non-install directories

This commit is contained in:
espeon65536 2021-08-15 06:13:58 -05:00 committed by Fabian Dill
parent 4730a928b5
commit ce6cdcaf92
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MinecraftClient.py
View File

@ -157,15 +157,15 @@ if __name__ == '__main__':
parser.add_argument("apmc_file", default=None, nargs='?', help="Path to an Archipelago Minecraft data file (.apmc)") parser.add_argument("apmc_file", default=None, nargs='?', help="Path to an Archipelago Minecraft data file (.apmc)")
args = parser.parse_args() args = parser.parse_args()
options = Utils.get_options()
apmc_file = os.path.abspath(args.apmc_file) if args.apmc_file is not None else None apmc_file = os.path.abspath(args.apmc_file) if args.apmc_file is not None else None
forge_dir = options["minecraft_options"]["forge_directory"]
max_heap = options["minecraft_options"]["max_heap_size"]
# Change to executable's working directory # Change to executable's working directory
os.chdir(os.path.abspath(os.path.dirname(sys.argv[0]))) os.chdir(os.path.abspath(os.path.dirname(sys.argv[0])))
options = Utils.get_options()
forge_dir = options["minecraft_options"]["forge_directory"]
max_heap = options["minecraft_options"]["max_heap_size"]
if apmc_file is not None and not os.path.isfile(apmc_file): if apmc_file is not None and not os.path.isfile(apmc_file):
raise FileNotFoundError(f"Path {apmc_file} does not exist or could not be accessed.") raise FileNotFoundError(f"Path {apmc_file} does not exist or could not be accessed.")
if not os.path.isdir(forge_dir): if not os.path.isdir(forge_dir):