fix: workaround the latest review

Toffikk · Toffikk · commit bdf872114277 · 2026-02-24T02:39:39.000+01:00
diff --git a/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/PatchingTasks.kt b/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/PatchingTasks.kt
@@ -22,6 +22,7 @@
 
 package io.papermc.paperweight.core.taskcontainers
 
+import io.papermc.paperweight.core.PaperweightCore
 import io.papermc.paperweight.core.tasks.SetupForkUpstreamSources
 import io.papermc.paperweight.core.tasks.patching.ApplyFeaturePatches
 import io.papermc.paperweight.core.tasks.patching.ApplyFilePatches
@@ -137,7 +138,9 @@ class PatchingTasks(
             ats.jstClasspath.from(
                 project.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME),
                 project.subprojects.map {
-                    it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }
+                    if (!it.plugins.hasPlugin(PaperweightCore::class)) {
+                        it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }
+                    }
                 }
             )
         }
@@ -180,7 +183,9 @@ class PatchingTasks(
             ats.jstClasspath.from(
                 project.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME),
                 project.subprojects.map {
-                    it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }
+                    if (!it.plugins.hasPlugin(PaperweightCore::class)) {
+                        it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }
+                    }
                 }
             )
             ats.jst.from(project.configurations.named(JST_CONFIG))

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`
`23`	`23`	`package io.papermc.paperweight.core.taskcontainers`
`24`	`24`
	`25`	`+import io.papermc.paperweight.core.PaperweightCore`
`25`	`26`	`import io.papermc.paperweight.core.tasks.SetupForkUpstreamSources`
`26`	`27`	`import io.papermc.paperweight.core.tasks.patching.ApplyFeaturePatches`
`27`	`28`	`import io.papermc.paperweight.core.tasks.patching.ApplyFilePatches`
`@@ -137,7 +138,9 @@ class PatchingTasks(`
`137`	`138`	`ats.jstClasspath.from(`
`138`	`139`	`project.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME),`
`139`	`140`	`project.subprojects.map {`
`140`		`- it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }`
	`141`	`+ if (!it.plugins.hasPlugin(PaperweightCore::class)) {`
	`142`	`+ it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }`
	`143`	`+ }`
`141`	`144`	`}`
`142`	`145`	`)`
`143`	`146`	`}`
`@@ -180,7 +183,9 @@ class PatchingTasks(`
`180`	`183`	`ats.jstClasspath.from(`
`181`	`184`	`project.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME),`
`182`	`185`	`project.subprojects.map {`
`183`		`- it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }`
	`186`	`+ if (!it.plugins.hasPlugin(PaperweightCore::class)) {`
	`187`	`+ it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }`
	`188`	`+ }`
`184`	`189`	`}`
`185`	`190`	`)`
`186`	`191`	`ats.jst.from(project.configurations.named(JST_CONFIG))`