Fix merged reobfuscation... not sure why this stopped working.

Author: PhoenixVX

src/main/java/org/mcphackers/mcp/tasks/TaskBuild.java

@@ -35,10 +35,10 @@ protected Stage[] setStages() {
 						() -> {
 							Side[] sides = side == Side.MERGED ? new Side[]{Side.CLIENT, Side.SERVER} : new Side[]{side};
 							for (Side localSide : sides) {
-								Path originalJar = MCPPaths.get(mcp, JAR_ORIGINAL, localSide);
-								Path reobfDir = MCPPaths.get(mcp, REOBF_SIDE, localSide);
-								Path buildJar = MCPPaths.get(mcp, BUILD_JAR, localSide);
-								Path buildZip = MCPPaths.get(mcp, BUILD_ZIP, localSide);
+								Path originalJar = MCPPaths.get(mcp, JAR_ORIGINAL, side == Side.MERGED ? Side.MERGED : localSide);
+								Path reobfDir = MCPPaths.get(mcp, REOBF_SIDE, side == Side.MERGED ? Side.MERGED : localSide);
+								Path buildJar = MCPPaths.get(mcp, BUILD_JAR, side == Side.MERGED ? Side.MERGED : localSide);
+								Path buildZip = MCPPaths.get(mcp, BUILD_ZIP, side == Side.MERGED ? Side.MERGED : localSide);
 								FileUtil.createDirectories(MCPPaths.get(mcp, BUILD));
 								if (mcp.getOptions().getBooleanParameter(TaskParameter.FULL_BUILD)) {
 									Files.deleteIfExists(buildJar);

src/main/java/org/mcphackers/mcp/tasks/TaskReobfuscate.java

@@ -66,8 +66,8 @@ private void reobfuscate() throws IOException {
 		Map<String, String> recompHashes = gatherMD5Hashes(true);
 
 		for (Side localSide : sides) {
-			final Path reobfDir = MCPPaths.get(mcp, REOBF_SIDE, localSide);
-			final Path reobfJar = MCPPaths.get(mcp, REOBF_JAR, localSide);
+			final Path reobfDir = MCPPaths.get(mcp, REOBF_SIDE, side == Side.MERGED ? Side.MERGED : localSide);
+			final Path reobfJar = MCPPaths.get(mcp, REOBF_JAR, side == Side.MERGED ? Side.MERGED : localSide);
 			Files.deleteIfExists(reobfJar);
 			RDInjector injector = new RDInjector(reobfBin);
 			Mappings mappings = getMappings(injector.getStorage(), localSide);