From 521276836f911f4988ea5e8f6c36804f48f5f2d9 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 --- .../0008-Check-Paper-versions.patch | 6 ++--- ...p-track-ver-1.14-for-version-command.patch | 22 +++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 Spigot-API-Patches/0184-Temp-track-ver-1.14-for-version-command.patch diff --git a/Spigot-API-Patches/0008-Check-Paper-versions.patch b/Spigot-API-Patches/0008-Check-Paper-versions.patch index b73709c746..78ab4f4e0c 100644 --- a/Spigot-API-Patches/0008-Check-Paper-versions.patch +++ b/Spigot-API-Patches/0008-Check-Paper-versions.patch @@ -1,11 +1,11 @@ -From c95ac122794bd807e5332c5f847746209cb18a7a Mon Sep 17 00:00:00 2001 +From e3823b8eaaa1f54104e13a283aab7a682fdb6cdb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 17:58:01 -0600 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 @@ -25,6 +25,14 @@ 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/0184-Temp-track-ver-1.14-for-version-command.patch b/Spigot-API-Patches/0184-Temp-track-ver-1.14-for-version-command.patch new file mode 100644 index 0000000000..37604d519f --- /dev/null +++ b/Spigot-API-Patches/0184-Temp-track-ver-1.14-for-version-command.patch @@ -0,0 +1,22 @@ +From a5beefed41fd637dfed924034905e153109a350b 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 +@@ -268,7 +268,7 @@ 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( +-- +2.21.0 +