Merge pull request #112 from embeddedt/fix-remap-deadlock

Fix RemapJarTaskImpl waiting indefinitely for TR to finish
unimined · Nov 16, 2024 · d400c2c · d400c2c
2 parents 30553e9 + 8430667
commit d400c2c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/task/RemapJarTaskImpl.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/task/RemapJarTaskImpl.kt
@@ -82,12 +82,12 @@ abstract class RemapJarTaskImpl @Inject constructor(provider: MinecraftConfig):
                 target.deleteIfExists()
                 throw e
             }
-            remapper.finish()
-            target.openZipFileSystem(mapOf("mutable" to true)).use {
-                betterMixinExtension.insertExtra(tag, it)
-            }
-            project.logger.info("[Unimined/RemapJar ${path}] remapped $fromNs -> $toNs (end time: ${System.currentTimeMillis()})")
         }.join()
+        remapper.finish()
+        target.openZipFileSystem(mapOf("mutable" to true)).use {
+            betterMixinExtension.insertExtra(tag, it)
+        }
+        project.logger.info("[Unimined/RemapJar ${path}] remapped $fromNs -> $toNs (end time: ${System.currentTimeMillis()})")
     }
 
 }