From 9918adf6fc4fdb725cb1953dfda5d9f649082ae4 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 16 Jan 2019 18:37:56 +0000
Subject: [PATCH] Fix build script error

---
 .gitignore   | 1 +
 build.gradle | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 85cd984640..fc422ae865 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .gradle/
 *-merged.jar
 *-mapped.jar
+*-intermediary.jar
 *.DS_Store
 build/
 out/
diff --git a/build.gradle b/build.gradle
index 870c9f173f..8afd62cf52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -173,6 +173,10 @@ task mergeJars(dependsOn: downloadMcJars) {
 		def server = inputs.files.files.find {it.name.endsWith("-server.jar")}
 		def merged = mergedFile
 
+		if(merged.exists()){
+			return
+		}
+
 		def jarMerger = new JarMerger(client, server, merged)
 		jarMerger.merge()
 		jarMerger.close()
@@ -439,11 +443,10 @@ void mapJar(File output, File input, File mappings, File libraries, String from,
 			remapper.read(file.toPath())
 		}
 		remapper.apply(input.toPath(), outputConsumer)
+		outputConsumer.close()
 		remapper.finish()
-		outputConsumer.close()
 	} catch (Exception e) {
-		remapper.finish();
-		outputConsumer.close()
+		remapper.finish()
 		throw new RuntimeException("Failed to remap jar", e);
 	}
 }