From 40edc359b71516d405936e3ee60f2be9ed5adc02 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Mon, 9 Apr 2018 16:13:08 -0400 Subject: [PATCH] Make version command use the direct link It was using a redirect, but apparently a small portion of systems, networks, some mess, are having problems with that redirect. Just use the direct link and skip the hassle. --- Spigot-API-Patches/Check-Paper-versions.patch | 4 ++-- .../Fix-ServerListPingEvent-flagging-as-Async.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Spigot-API-Patches/Check-Paper-versions.patch b/Spigot-API-Patches/Check-Paper-versions.patch index f4a82a5e85..0eb1f7f20b 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 760d58eb..aae605e9 100644 +index 760d58eb..044361af 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.json.simple.JSONObject; @@ -98,7 +98,7 @@ index 760d58eb..aae605e9 100644 + private static int getFromJenkins(int currentVer) { + try { + BufferedReader reader = Resources.asCharSource( -+ new URL("https://ci.destroystokyo.com/job/PaperSpigot/lastSuccessfulBuild/buildNumber"), // Paper ++ new URL("https://ci.destroystokyo.com/job/Paper/lastSuccessfulBuild/buildNumber"), // Paper + Charsets.UTF_8 + ).openBufferedStream(); + try { diff --git a/Spigot-API-Patches/Fix-ServerListPingEvent-flagging-as-Async.patch b/Spigot-API-Patches/Fix-ServerListPingEvent-flagging-as-Async.patch index 6b5e009d6d..f1d052943a 100644 --- a/Spigot-API-Patches/Fix-ServerListPingEvent-flagging-as-Async.patch +++ b/Spigot-API-Patches/Fix-ServerListPingEvent-flagging-as-Async.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ServerListPingEvent flagging as Async This event can sometimes fire Async, set the proper boolean diff --git a/src/main/java/org/bukkit/event/server/ServerEvent.java b/src/main/java/org/bukkit/event/server/ServerEvent.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +index eb00d6af..70416c81 100644 --- a/src/main/java/org/bukkit/event/server/ServerEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerEvent.java @@ -0,0 +0,0 @@ @@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end } diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +index 343f238f..3c38d857 100644 --- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java @@ -0,0 +0,0 @@ public class ServerListPingEvent extends ServerEvent implements Iterable