Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-01 22:14:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
microwin7 2022-05-13 22:29:42 +03:00
commit 2e28691e35
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java
View file

@ -77,6 +77,9 @@ public void complete(LineReader reader, ParsedLine line, List<Candidate> candida
});
} else {
Command target = findCommand(line.words().get(0));
if(target == null) {
return;
}
List<String> words = line.words();
List<Candidate> candidates1 = target.complete(words.subList(1, words.size()), line.wordIndex() - 1, completeWord);
candidates.addAll(candidates1);

4
ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java
View file

@ -156,7 +156,9 @@ public void run(String... args) throws Throwable {
LogHelper.info("ServerWrapper: LaunchServer address: %s. Title: %s", config.address, Launcher.profile != null ? Launcher.profile.getTitle() : "unknown");
LogHelper.info("Minecraft Version (for profile): %s", wrapper.profile == null ? "unknown" : wrapper.profile.getVersion().name);
String[] real_args;
if (args.length > 0) {
if(config.args != null && config.args.size() > 0) {
real_args = config.args.toArray(new String[0]);
} else if (args.length > 0) {
real_args = new String[args.length - 1];
System.arraycopy(args, 1, real_args, 0, args.length - 1);
} else real_args = args;

2
modules

@ -1 +1 @@
Subproject commit 56ad1f1d6a9d72e17f8283b077a9b4b53bfc5eb0
Subproject commit 84676190f36dfe087e0523542c2167611c80b57a