Another attempt at fixing issues with fernflower's classpath

2 files changed, 7 insertions, 8 deletions

diff --git a/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java b/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
index 61dbaf07..ecc13866 100644
--- a/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
+++ b/src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
@@ -100,7 +100,7 @@ public abstract class AbstractFernFlowerDecompiler implements LoomDecompiler {
 
 		progressGroup.started();
 		ExecResult result = ForkingJavaExec.javaexec(
-				project.getRootProject().getPlugins().hasPlugin("fabric-loom") ? project.getRootProject() : project,
+				project,
 				spec -> {
 					spec.setMain(fernFlowerExecutor().getName());
 					spec.jvmArgs("-Xms200m", "-Xmx3G");
diff --git a/src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java b/src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
index 4c0e21ad..f7e771d3 100644
--- a/src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
+++ b/src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
@@ -47,15 +47,14 @@ public class ForkingJavaExec {
 		});
 	}
 
-	private static Set<Configuration> getForkedFernflowerClasspath(Project project) {
+	private static Configuration[] getForkedFernflowerClasspath(Project project) {
 		Set<Configuration> allConfigurations = new HashSet<>();
-		Project p = project;
+		allConfigurations.addAll(project.getBuildscript().getConfigurations());
 
-		do {
-			allConfigurations.addAll(p.getBuildscript().getConfigurations());
-			p = p.getRootProject();
-		} while (p != p.getRootProject());
+		if (project.getRootProject() != project) {
+			allConfigurations.addAll(project.getRootProject().getBuildscript().getConfigurations());
+		}
 
-		return allConfigurations;
+		return allConfigurations.toArray(new Configuration[0]);
 	}
 }