From 951a8543845709e1e1c64c093eece7d2b0024fbd Mon Sep 17 00:00:00 2001
From: Antony Derham <antonyderham@gmail.com>
Date: Thu, 12 Mar 2015 14:37:26 +0000
Subject: [PATCH] Correct location/to mix-up

If .url.txt is used, the manifest file should specify that as the download location, not the local "to" location
---
 .../launcher/builder/ClientFileCollector.java | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/launcher-builder/src/main/java/com/skcraft/launcher/builder/ClientFileCollector.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/ClientFileCollector.java
index de8862a..179ffec 100644
--- a/launcher-builder/src/main/java/com/skcraft/launcher/builder/ClientFileCollector.java
+++ b/launcher-builder/src/main/java/com/skcraft/launcher/builder/ClientFileCollector.java
@@ -58,21 +58,22 @@ public class ClientFileCollector extends DirectoryWalker {
             return;
         }
 
-        // url.txt override file
-        File urlFile = new File(file.getAbsoluteFile().getParentFile(), file.getName() + URL_FILE_SUFFIX);
-        String to;
-        if (urlFile.exists()) {
-            to = Files.readFirstLine(urlFile, Charset.defaultCharset());
-        } else {
-            to = FilenameUtils.separatorsToUnix(FilenameUtils.normalize(relPath));
-        }
-
         FileInstall entry = new FileInstall();
         String hash = Files.hash(file, hf).toString();
-        String hashedPath = hash.substring(0, 2) + "/" + hash.substring(2, 4) + "/" + hash;
-        File destPath = new File(destDir, hashedPath);
+        String to = FilenameUtils.separatorsToUnix(FilenameUtils.normalize(relPath));
+        
+        // url.txt override file
+        File urlFile = new File(file.getAbsoluteFile().getParentFile(), file.getName() + URL_FILE_SUFFIX);
+        String location;
+        if (urlFile.exists()) {
+            location = Files.readFirstLine(urlFile, Charset.defaultCharset());
+        } else {
+            location = hash.substring(0, 2) + "/" + hash.substring(2, 4) + "/" + hash;
+        }
+        
+        File destPath = new File(destDir, location);
         entry.setHash(hash);
-        entry.setLocation(hashedPath);
+        entry.setLocation(location);
         entry.setTo(to);
         entry.setSize(file.length());
         applicator.apply(entry);