From 4944e87d370b8dfd5352e7e6c985fbc4827f496f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 7 May 2019 20:49:42 -0500
Subject: [PATCH] Updated upstream

---
 .gitmodules                    |  2 +-
 Paper                          |  2 +-
 current-paper                  |  2 +-
 patches/api/0001-Rebrand.patch | 19 +++++++++----------
 scripts/generatesources.sh     |  2 +-
 scripts/upstream.sh            |  2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 1ed0680b7..fafe4f92f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "Paper"]
         path = Paper
         url = https://github.com/PaperMC/Paper.git
-        branch = ver/1.14-pre5
+        branch = ver/1.14
diff --git a/Paper b/Paper
index bc024aec6..427078900 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit bc024aec6e648ce3ca45d3fc487c0f408b6040e1
+Subproject commit 427078900ebedd41124893de595dca2e5ff9d2d8
diff --git a/current-paper b/current-paper
index b010029ac..cd68549fa 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.14--4168b329732ffe495224049fa0e0b8fec6acbb40
+1.14--6d2fa1e300cfaf9bf99fb2a8f05f062f2aa3ba3b
diff --git a/patches/api/0001-Rebrand.patch b/patches/api/0001-Rebrand.patch
index 2095dff70..a119b32f4 100644
--- a/patches/api/0001-Rebrand.patch
+++ b/patches/api/0001-Rebrand.patch
@@ -1,12 +1,12 @@
-From 7b6ccc334157135036716bd93907cbb34f28cd82 Mon Sep 17 00:00:00 2001
+From 030c7d02cb82e6d69c78911fb6deaceabd05f7c7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 00:57:16 -0500
 Subject: [PATCH] Rebrand
 
 ---
- pom.xml                                       |  9 ++++----
- .../command/defaults/VersionCommand.java      | 21 +++++++++++--------
- 2 files changed, 16 insertions(+), 14 deletions(-)
+ pom.xml                                       |  9 ++++-----
+ .../command/defaults/VersionCommand.java      | 20 ++++++++++---------
+ 2 files changed, 15 insertions(+), 14 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
 index 81aefdf7..d73f48ae 100644
@@ -36,7 +36,7 @@ index 81aefdf7..d73f48ae 100644
  
      <properties>
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index a36ab04c..42c88ae1 100644
+index ece8d1c8..0c1b0a61 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 @@ -211,8 +211,8 @@ public class VersionCommand extends BukkitCommand {
@@ -50,7 +50,7 @@ index a36ab04c..42c88ae1 100644
              int distance = getDistance(null, parts[0]);
              switch (distance) {
                  case -1:
-@@ -263,13 +263,16 @@ public class VersionCommand extends BukkitCommand {
+@@ -263,13 +263,15 @@ public class VersionCommand extends BukkitCommand {
  
      // Paper start
      private static int getDistance(@NotNull String repo, @NotNull String verInfo) {
@@ -59,17 +59,16 @@ index a36ab04c..42c88ae1 100644
 -            return getFromJenkins(currentVer);
 -        } catch (NumberFormatException ex) {
 -            verInfo = verInfo.replace("\"", "");
--            return getFromRepo("PaperMC/Paper", "master", verInfo);
+-            return getFromRepo("PaperMC/Paper", "ver/1.14", verInfo); // Just for now
 -        }
 +        // Purpur start
 +        //try {
 +        //    int currentVer = Integer.decode(verInfo);
 +        //    return getFromJenkins(currentVer);
 +        //} catch (NumberFormatException ex) {
-+        //    verInfo = verInfo.replace("\"", "");
-+        //    return getFromRepo("PaperMC/Paper", "master", verInfo);
++            //verInfo = verInfo.replace("\"", "");
++            return getFromRepo("pl3xgaming/Purpur", "ver/1.14", verInfo.replace("\"", ""));
 +        //}
-+        return getFromRepo("pl3xgaming/Purpur", "master", verInfo.replace("\"", ""));
 +        // Purpur end
              /*
              BufferedReader reader = Resources.asCharSource(
diff --git a/scripts/generatesources.sh b/scripts/generatesources.sh
index 30c76718a..7c3bc5b60 100755
--- a/scripts/generatesources.sh
+++ b/scripts/generatesources.sh
@@ -13,7 +13,7 @@ cd $basedir
 paperVer=$(cat current-paper)
 
 minecraftversion=$(cat $basedir/Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
-decompile="Paper/work/Minecraft/$minecraftversion/forge"
+decompile="Paper/work/Minecraft/$minecraftversion/spigot"
 
 mkdir -p mc-dev/src/net/minecraft/server
 
diff --git a/scripts/upstream.sh b/scripts/upstream.sh
index 0d6882125..e486a9a0a 100755
--- a/scripts/upstream.sh
+++ b/scripts/upstream.sh
@@ -11,7 +11,7 @@ done
 if [[ "$1" == up* ]]; then
 	(
 		cd "$basedir/Paper/"
-		git fetch && git reset --hard origin/ver/1.14-pre5
+		git fetch && git reset --hard origin/ver/1.14
 		cd ../
 		git add Paper
 	)