From 239e4596b4516a6b02d8eeac2e40f6be959df75d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 29 Mar 2020 16:03:51 -0500
Subject: [PATCH] Revert back to original paperclip (for java 8 support)

---
 .gitmodules           | 3 ---
 Paperclip             | 1 -
 scripts/purpurclip.sh | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 160000 Paperclip

diff --git a/.gitmodules b/.gitmodules
index 60a2b8cf9..fafe4f92f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,6 +2,3 @@
         path = Paper
         url = https://github.com/PaperMC/Paper.git
         branch = ver/1.14
-[submodule "Paperclip"]
-	path = Paperclip
-	url = https://github.com/pl3xgaming/Paperclip.git
diff --git a/Paperclip b/Paperclip
deleted file mode 160000
index 2956ff325..000000000
--- a/Paperclip
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2956ff325ee72b7a3f4aae6e94fabd62e8d134ed
diff --git a/scripts/purpurclip.sh b/scripts/purpurclip.sh
index cf3271fcd..cb6464ea6 100755
--- a/scripts/purpurclip.sh
+++ b/scripts/purpurclip.sh
@@ -8,10 +8,10 @@
     vanillajar="$workdir/Minecraft/$mcver/$mcver.jar"
 
     (
-        cd "$basedir/Paperclip"
+        cd "$workdir/Paperclip"
         mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$purpurjar" "-Dvanillajar=$vanillajar"
     )
-    cp "$basedir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/purpurclip.jar"
+    cp "$workdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/purpurclip.jar"
 
     echo ""
     echo ""