|
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.ApplyBasePatches |
27 | 28 | import io.papermc.paperweight.core.tasks.patching.ApplyFeaturePatches |
@@ -161,8 +162,10 @@ class PatchingTasks( |
161 | 162 | ats.jst.from(project.configurations.named(JST_CONFIG)) |
162 | 163 | ats.jstClasspath.from( |
163 | 164 | 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 |
166 | 169 | } |
167 | 170 | ) |
168 | 171 | validateAts.set(this@PatchingTasks.validateAts) |
@@ -214,8 +217,10 @@ class PatchingTasks( |
214 | 217 |
|
215 | 218 | ats.jstClasspath.from( |
216 | 219 | 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 |
219 | 224 | } |
220 | 225 | ) |
221 | 226 | ats.jst.from(project.configurations.named(JST_CONFIG)) |
|
0 commit comments