artegoser/pimi-launcher-core
1
0
Fork 0
mirror of https://github.com/artegoser/pimi-launcher-core.git synced 2025-02-23 20:51:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into custom-lauch-args-fix

Browse source
This commit is contained in:
Corentin Grall 2020-04-30 15:04:41 +02:00 • committed by GitHub
commit b5d688fd02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/handler.js
View file

@ -337,7 +337,6 @@ class Handler {
const downloadLink = `${url}${lib[0].replace(/\./g, '/')}/${lib[1]}/${lib[2]}/${name}`;
if(fs.existsSync(path.join(jarPath, name))) {
paths.push(`${jarPath}${path.sep}${name}`);
counter = counter + 1;
@ -475,7 +474,7 @@ class Handler {
const assetRoot = this.options.overrides.assetRoot || path.join(this.options.root, 'assets');
const assetPath = this.version.assets === "legacy" || this.version.assets === "pre-1.6" ? path.join(assetRoot, 'legacy') : path.join(assetRoot);
const minArgs = this.options.overrides.minArgs || 5;
const minArgs = this.options.overrides.minArgs || this.version.assets === "legacy" ? 5 : 11;
if(args.length < minArgs) args = args.concat(this.version.minecraftArguments ? this.version.minecraftArguments.split(' ') : this.version.arguments.game);
this.options.authorization = await Promise.resolve(this.options.authorization);
@ -514,9 +513,7 @@ class Handler {
'--proxyPass',
this.options.proxy.password
);
if(this.options.customLaunchArgs) this.options.customLaunchArgs.forEach(customArg => args = args.concat(customArg.split(' ')))
this.client.emit('debug', '[MCLC]: Set launch options');
resolve(args);
});