From e19820e04d8fd90c4c587abf252e70c83437e345 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Tue, 12 Jan 2016 15:32:58 -0800
Subject: [PATCH] Fix shadow, remove extra source jar in forge

---
 build.gradle                 | 19 ++++++++++++-------
 worldedit-forge/build.gradle |  6 ++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index b797f51f2..be685f667 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,11 +75,6 @@ subprojects {
         }
     }
 
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
-    }
-
     task javadocJar(type: Jar, dependsOn: javadoc) {
         classifier = 'javadoc'
         from javadoc.destinationDir
@@ -87,13 +82,23 @@ subprojects {
 
     artifacts {
         archives jar
-        archives sourcesJar
         archives javadocJar
     }
 
+    if (!name.equals('worldedit-forge')) {
+        task sourcesJar(type: Jar, dependsOn: classes) {
+            classifier = 'sources'
+            from sourceSets.main.allSource
+        }
+
+        artifacts {
+            archives sourcesJar
+        }
+        build.dependsOn(sourcesJar)
+    }
+
     build.dependsOn(checkstyleMain)
     build.dependsOn(checkstyleTest)
-    build.dependsOn(sourcesJar)
     build.dependsOn(javadocJar)
 
     shadowJar {
diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle
index dd5d5c9bd..d705b95ea 100644
--- a/worldedit-forge/build.gradle
+++ b/worldedit-forge/build.gradle
@@ -67,7 +67,9 @@ shadowJar {
 }
 
 reobf {
-    shadowJar
+    shadowJar {
+        mappingType = 'SEARGE'
+    }
 }
 
 task deobfJar(type: Jar) {
@@ -79,4 +81,4 @@ artifacts {
     archives deobfJar
 }
 
-build.dependsOn(shadowJar)
+build.dependsOn(reobfShadowJar)