Skip to content

Commit 92ab00a

Browse files
committed
fix: workaround the latest review
1 parent 6796334 commit 92ab00a

File tree

1 file changed

+9
-4
lines changed
  • paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers

1 file changed

+9
-4
lines changed

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/PatchingTasks.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
package io.papermc.paperweight.core.taskcontainers
2424

25+
import io.papermc.paperweight.core.PaperweightCore
2526
import io.papermc.paperweight.core.tasks.SetupForkUpstreamSources
2627
import io.papermc.paperweight.core.tasks.patching.ApplyBasePatches
2728
import io.papermc.paperweight.core.tasks.patching.ApplyFeaturePatches
@@ -161,8 +162,10 @@ class PatchingTasks(
161162
ats.jst.from(project.configurations.named(JST_CONFIG))
162163
ats.jstClasspath.from(
163164
project.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME),
164-
project.subprojects.map {
165-
it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }
165+
project.subprojects.mapNotNull {
166+
if (!it.plugins.hasPlugin(PaperweightCore::class)) {
167+
it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }
168+
} else null
166169
}
167170
)
168171
validateAts.set(this@PatchingTasks.validateAts)
@@ -214,8 +217,10 @@ class PatchingTasks(
214217

215218
ats.jstClasspath.from(
216219
project.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME),
217-
project.subprojects.map {
218-
it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }
220+
project.subprojects.mapNotNull {
221+
if (!it.plugins.hasPlugin(PaperweightCore::class)) {
222+
it.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).map { it.files }
223+
} else null
219224
}
220225
)
221226
ats.jst.from(project.configurations.named(JST_CONFIG))

0 commit comments

Comments
 (0)