From f7731572d10fcc58797f263a7930766df880c110 Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Tue, 29 Jun 2021 12:37:24 +0300
Subject: [PATCH] Fix "merging" the jar twice

---
 .../providers/forge/MinecraftPatchedProvider.java         | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
index 8357e393..6dd2a75d 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
@@ -251,11 +251,7 @@ public class MinecraftPatchedProvider extends DependencyProvider {
 		}
 
 		if (dirty) {
-			remapPatchedJars(getProject().getLogger());
-		}
-
-		if (dirty || !minecraftMergedPatchedJar.exists()) {
-			mergeJars(getProject().getLogger());
+			remapPatchedJar(getProject().getLogger());
 		}
 
 		this.filesDirty = dirty;
@@ -431,7 +427,7 @@ public class MinecraftPatchedProvider extends DependencyProvider {
 		}
 	}
 
-	private void remapPatchedJars(Logger logger) throws Exception {
+	private void remapPatchedJar(Logger logger) throws Exception {
 		Path[] libraries = MinecraftMappedProvider.getRemapClasspath(getProject());
 		logger.lifecycle(":remapping minecraft (TinyRemapper, srg -> official)");
 		TinyTree mappingsWithSrg = getExtension().getMappingsProvider().getMappingsWithSrg();