Merge hotfix/5.6.16

This commit is contained in:
Gravita 2025-06-21 20:02:17 +07:00
commit 183d0fc9df

View file

@ -166,7 +166,7 @@ private static void realMain(String[] args) throws Throwable {
} }
Set<Path> ignoredPath = new HashSet<>(); Set<Path> ignoredPath = new HashSet<>();
if(options.moduleConf != null && options.moduleConf.modulePath != null) { if(options.moduleConf != null && options.moduleConf.modulePath != null) {
List<Path> resolvedModulePath = resolveClassPath(ignoredPath, clientDir, null, params.profile).toList(); List<Path> resolvedModulePath = resolveClassPathStream(ignoredPath, clientDir, options.moduleConf.modulePath).toList();
} }
List<Path> classpath = resolveClassPath(ignoredPath, clientDir, params.actions, params.profile) List<Path> classpath = resolveClassPath(ignoredPath, clientDir, params.actions, params.profile)
.collect(Collectors.toCollection(ArrayList::new)); .collect(Collectors.toCollection(ArrayList::new));