From 110cf372eb5aa85df20b248976f1acdefa85e102 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Sun, 30 Jun 2013 19:41:51 -0700
Subject: [PATCH] Add deobf data to merge-common, worspace is now actually
 runnable!

---
 build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 367677301c..e08d7f462c 100644
--- a/build.xml
+++ b/build.xml
@@ -131,9 +131,10 @@
     </copy>
   </target>
 
-  <target name="merge-common">
+  <target name="merge-common" depends="buildenvsetup,build-deobf-data">
     <copy todir="${client.mcp.srcdir}" overwrite="true" verbose="true">
       <fileset dir="${common.src.dir}" includes="**/*.java" />
+      <fileset dir="${basedir}" includes="deobfuscation_data-${version.minecraft}.lzma"/>
     </copy>
   </target>
 
@@ -233,7 +234,7 @@
     <delete dir="build-tmp-deobf" />
   </target>
 
-  <target name="build" depends="buildenvsetup,merge-client,merge-common,build-deobf-data,build-universal,build-source-pack" />
+  <target name="build" depends="buildenvsetup,build-deobf-data,merge-client,merge-common,build-universal,build-source-pack" />
 
   <target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build" />