From 2d085853c614a001b66cc2deae8eab72d7ff27d3 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 7 May 2019 16:45:01 +0100 Subject: [PATCH] make version command track the correct version --- Spigot-API-Patches/Check-Paper-versions.patch | 4 ++-- ...p-track-ver-1.14-for-version-command.patch | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 Spigot-API-Patches/Temp-track-ver-1.14-for-version-command.patch diff --git a/Spigot-API-Patches/Check-Paper-versions.patch b/Spigot-API-Patches/Check-Paper-versions.patch index 1e3b55335a..778af0a06a 100644 --- a/Spigot-API-Patches/Check-Paper-versions.patch +++ b/Spigot-API-Patches/Check-Paper-versions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Check Paper versions diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index cbce5244..5a1f9504 100644 +index cbce52444..4f9042e23 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java @@ -0,0 +0,0 @@ import org.bukkit.plugin.PluginDescriptionFile; @@ -101,7 +101,7 @@ index cbce5244..5a1f9504 100644 + private static int getFromJenkins(int currentVer) { + try { + BufferedReader reader = Resources.asCharSource( -+ new URL("https://ci.destroystokyo.com/job/Paper-1.13/lastSuccessfulBuild/buildNumber"), // Paper ++ new URL("https://ci.destroystokyo.com/job/Paper-1.14/lastSuccessfulBuild/buildNumber"), // Paper + Charsets.UTF_8 + ).openBufferedStream(); + try { diff --git a/Spigot-API-Patches/Temp-track-ver-1.14-for-version-command.patch b/Spigot-API-Patches/Temp-track-ver-1.14-for-version-command.patch new file mode 100644 index 0000000000..1e7d858ebb --- /dev/null +++ b/Spigot-API-Patches/Temp-track-ver-1.14-for-version-command.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shane Freeder +Date: Tue, 7 May 2019 16:44:03 +0100 +Subject: [PATCH] Temp track ver/1.14 for version command + + +diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java +index 27f0cadd9..ece8d1c8a 100644 +--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java ++++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java +@@ -0,0 +0,0 @@ public class VersionCommand extends BukkitCommand { + 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 + } + /* + BufferedReader reader = Resources.asCharSource( +-- \ No newline at end of file