Skip to content

Commit 283ee51

Browse files
committed
actually fix
1 parent a0a6d1b commit 283ee51

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

paperweight-core/src/main/kotlin/io/papermc/paperweight/patcher/PaperweightPatcher.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,20 @@ abstract class PaperweightPatcher : Plugin<Project> {
116116
upstream.directoryPatchSets.names.joinToString(", ") + ", ${upstream.name} single file"
117117
)
118118
applyForDownstream { dependsOn("apply${upstream.name.capitalized()}Patches") }
119+
val depend = "apply${upstream.name.capitalized()}Patches"
120+
val depend1 = "apply${upstream.name.capitalized()}SingleFilePatches"
121+
119122
tasks.register<RunNestedBuild>("applyAllPatches") {
120123
group = "patching"
121-
val depend = "apply${upstream.name.capitalized()}Patches"
122124
tasks.addAll("applyAllServerPatches")
123125
description = "Applies all patches defined in the paperweight-patcher project and the server project. " +
124-
"(equivalent to running '$depend' and then '${tasks.get().single()}' in a second Gradle invocation)"
126+
"(equivalent to running '$depend1' and '$depend', and then ${tasks.get().single()}' in a second Gradle invocation)"
125127
projectDir.set(layout.projectDirectory)
126-
dependsOn("apply${upstream.name.capitalized()}SingleFilePatches")
127-
finalizedBy(depend)
128+
dependsOn(depend)
129+
}
130+
131+
this@afterEvaluate.tasks.named(depend).configure {
132+
dependsOn(depend1)
128133
}
129134
}
130135
}

0 commit comments

Comments
 (0)