chore: Always make mc-dev-sources when applying patches

--------- Co-authored-by: Bjarne Koll <[email protected]>
LeavesMC · Nov 16, 2024 · 6ca8067 · 6ca8067
1 parent e717ec1
commit 6ca8067
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/...ht-patcher/src/main/kotlin/io/papermc/paperweight/patcher/tasks/PatcherApplyGitPatches.kt b/...ht-patcher/src/main/kotlin/io/papermc/paperweight/patcher/tasks/PatcherApplyGitPatches.kt
@@ -161,8 +161,10 @@ abstract class PatcherApplyGitPatches : ControllableOutputTask() {
         git("tag", "-d", "base").runSilently(silenceErr = true)
         git("tag", "base").executeSilently()
 
-        applyGitPatches(git, target, output, patchDir.pathOrNull, printOutput.get(), verbose.get())
-
-        makeMcDevSrc(layout.cache, sourceMcDevJar.path, mcDevSources.path, outputDir.path, srcDir, dataDir)
+        try {
+            applyGitPatches(git, target, output, patchDir.pathOrNull, printOutput.get(), verbose.get())
+        } finally {
+            makeMcDevSrc(layout.cache, sourceMcDevJar.path, mcDevSources.path, outputDir.path, srcDir, dataDir)
+        }
     }
 }
diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/ApplyPaperPatches.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/ApplyPaperPatches.kt
@@ -165,9 +165,11 @@ abstract class ApplyPaperPatches : ControllableOutputTask() {
             git("tag", "-d", "base").runSilently(silenceErr = true)
             git("tag", "base").executeSilently()
 
-            applyGitPatches(git, target, outputFile, patchDir.path, printOutput.get(), verbose.get())
-
-            makeMcDevSrc(layout.cache, sourceMcDevJar.path, mcDevSources.path, outputDir.path, sourceDir, mcDataDir)
+            try {
+                applyGitPatches(git, target, outputFile, patchDir.path, printOutput.get(), verbose.get())
+            } finally {
+                makeMcDevSrc(layout.cache, sourceMcDevJar.path, mcDevSources.path, outputDir.path, sourceDir, mcDataDir)
+            }
         }
     }