fix circular ref

jpenilla · jpenilla · commit 20216c1b49f0 · 2025-03-13T14:54:56.000-07:00
diff --git a/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/MinecraftPatchingTasks.kt b/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/MinecraftPatchingTasks.kt
@@ -82,7 +82,7 @@ class MinecraftPatchingTasks(
             output.set(outputSrc)
         }
         patches.set(sourcePatchDir.fileExists(project))
-        rejectsDir.set(rejectsDir)
+        rejectsDir.set(this@MinecraftPatchingTasks.rejectsDir)
         gitFilePatches.set(this@MinecraftPatchingTasks.gitFilePatches)
         identifier = configName
     }
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
@@ -67,7 +67,7 @@ class PatchingTasks(
             output.set(outputDir)
         }
         patches.set(filePatchDir.fileExists(project))
-        rejectsDir.set(rejectsDir)
+        rejectsDir.set(this@PatchingTasks.rejectsDir)
         gitFilePatches.set(this@PatchingTasks.gitFilePatches)
         baseRef.set("base")
         identifier = "$forkName $patchSetName"

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class MinecraftPatchingTasks(`
`82`	`82`	`output.set(outputSrc)`
`83`	`83`	`}`
`84`	`84`	`patches.set(sourcePatchDir.fileExists(project))`
`85`		`- rejectsDir.set(rejectsDir)`
	`85`	`+ rejectsDir.set(this@MinecraftPatchingTasks.rejectsDir)`
`86`	`86`	`gitFilePatches.set(this@MinecraftPatchingTasks.gitFilePatches)`
`87`	`87`	`identifier = configName`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class PatchingTasks(`
`67`	`67`	`output.set(outputDir)`
`68`	`68`	`}`
`69`	`69`	`patches.set(filePatchDir.fileExists(project))`
`70`		`- rejectsDir.set(rejectsDir)`
	`70`	`+ rejectsDir.set(this@PatchingTasks.rejectsDir)`
`71`	`71`	`gitFilePatches.set(this@PatchingTasks.gitFilePatches)`
`72`	`72`	`baseRef.set("base")`
`73`	`73`	`identifier = "$forkName $patchSetName"`