From 600dd0270300fa16715ab85b13924ca824f4a99c Mon Sep 17 00:00:00 2001 From: Gravita Date: Sat, 16 Apr 2022 19:16:40 +0700 Subject: [PATCH 1/7] [FIX] JLine complete NPE --- .../java/pro/gravit/utils/command/JLineCommandHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java b/LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java index bcb92bbd..e8a48d0b 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java @@ -77,6 +77,9 @@ public void complete(LineReader reader, ParsedLine line, List candida }); } else { Command target = findCommand(line.words().get(0)); + if(target == null) { + return; + } List words = line.words(); List candidates1 = target.complete(words.subList(1, words.size()), line.wordIndex() - 1, completeWord); candidates.addAll(candidates1); From 126d23037e5ddd4f76b166ef458ab28aba6279ff Mon Sep 17 00:00:00 2001 From: Gravit'a Date: Mon, 18 Apr 2022 20:03:02 +0700 Subject: [PATCH 2/7] [ANY] Update modules --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 56ad1f1d..c495dd13 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 56ad1f1d6a9d72e17f8283b077a9b4b53bfc5eb0 +Subproject commit c495dd132e380a8cb83ba2232c07b24ff107496a From ccb297a498c27f0eb0ffd831b5aac416725d1802 Mon Sep 17 00:00:00 2001 From: Gravit'a Date: Mon, 18 Apr 2022 21:06:48 +0700 Subject: [PATCH 3/7] [ANY] Update modules --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index c495dd13..6f43b20b 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit c495dd132e380a8cb83ba2232c07b24ff107496a +Subproject commit 6f43b20b0e4f2e1c0b60819bbbd2c52a43743984 From 4400cbe1920f86ea3d691fe1243c84fff656b660 Mon Sep 17 00:00:00 2001 From: Gravit'a Date: Mon, 18 Apr 2022 21:32:30 +0700 Subject: [PATCH 4/7] [ANY] Update modules --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 6f43b20b..c0f57594 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 6f43b20b0e4f2e1c0b60819bbbd2c52a43743984 +Subproject commit c0f5759486d5b15c46280050fc3f2f67379d585d From 95704fc1bf3ecc8a06f715a98115c330a8d1bcae Mon Sep 17 00:00:00 2001 From: Gravita Date: Mon, 2 May 2022 23:08:30 +0700 Subject: [PATCH 5/7] [FIX] OSSLSignCode --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index c0f57594..fcdf8ec8 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit c0f5759486d5b15c46280050fc3f2f67379d585d +Subproject commit fcdf8ec83b7f2a67b7e75d43ff0c679adde02dda From 5d332a10b586ee977411b96d7bd629326049a7ac Mon Sep 17 00:00:00 2001 From: Gravita Date: Wed, 11 May 2022 22:05:34 +0700 Subject: [PATCH 6/7] [FIX] ServerWrapper config args --- .../main/java/pro/gravit/launcher/server/ServerWrapper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java index ee104166..97eddf74 100644 --- a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java @@ -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; From c75185f697fe0c24335666562eef4b31e7b007ee Mon Sep 17 00:00:00 2001 From: Gravita Date: Fri, 13 May 2022 23:24:54 +0700 Subject: [PATCH 7/7] [ANY] Update modules --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index fcdf8ec8..84676190 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit fcdf8ec83b7f2a67b7e75d43ff0c679adde02dda +Subproject commit 84676190f36dfe087e0523542c2167611c80b57a