imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-01 21:17:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge

Browse Source
This commit is contained in:
shedaniel
2021-05-14 06:58:43 +08:00
parent 3364e7ae64 b90ce217ab
commit c307394912
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
View File

@@ -31,7 +31,6 @@ import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.zip.ZipError;
import com.google.common.io.Files;
import com.google.gson.Gson;
@@ -109,11 +108,11 @@ public class MinecraftProvider extends DependencyProvider {
if (!minecraftMergedJar.exists() || isRefreshDeps()) {
try {
mergeJars(getProject().getLogger());
} catch (ZipError e) {
} catch (Throwable e) {
deleteFiles();
getProject().getLogger().error("Could not merge JARs! Deleting source JARs - please re-run the command and move on.", e);
throw new RuntimeException();
throw e;
}
}
}