From 9fdca54f665b9750ea277c555b7b54f080011b6d Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 6 Jun 2016 13:50:15 -0600
Subject: [PATCH] Claenup stuff, add metrics, and rename references from
 Waterfall to Travertine

---
 .gitmodules     |  3 ---
 applyPatches.sh |  8 +++++++-
 build.sh        |  2 +-
 prepareBuild.sh | 12 ------------
 4 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 100755 prepareBuild.sh

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index f5069af..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "Waterfall"]
-	path = Waterfall
-	url = https://github.com/WaterfallMC/Waterfall.git
diff --git a/applyPatches.sh b/applyPatches.sh
index 0171df5..7118f73 100755
--- a/applyPatches.sh
+++ b/applyPatches.sh
@@ -60,8 +60,14 @@ if [[ "$gpgsign" == "true" ]]; then
     git config --global commit.gpgsign false
 fi
 
+# Apply waterfall patches
+basedir=$basedir/Waterfall
+pushd Waterfall
+applyPatch BungeeCord Waterfall-Proxy HEAD
+popd
+basedir=$(dirname $basedir)
 
-# Apply patches
+# Apply travertine patches
 applyPatch Waterfall/Waterfall-Proxy Travertine-Proxy HEAD
 
 enableCommitSigningIfNeeded
diff --git a/build.sh b/build.sh
index 8c7ceb2..ff81108 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-./prepareBuild.sh && pushd Travertine-Proxy && mvn clean package && popd
+./applyPatches.sh && pushd Travertine-Proxy && mvn clean package && popd
 
diff --git a/prepareBuild.sh b/prepareBuild.sh
deleted file mode 100755
index cb8d9e2..0000000
--- a/prepareBuild.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-git submodule update --recursive --init
-
-pushd Waterfall
-
-./applyPatches.sh
-
-popd
-
-./applyPatches.sh
-