From d4c3e49a0660687c69a10467e5d709f402ec311e Mon Sep 17 00:00:00 2001 From: Zach Brown 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/0008-Check-Paper-versions.patch | 8 ++++---- .../0019-Fix-ServerListPingEvent-flagging-as-Async.patch | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Spigot-API-Patches/0008-Check-Paper-versions.patch b/Spigot-API-Patches/0008-Check-Paper-versions.patch index 92841f9d49..629c285cd6 100644 --- a/Spigot-API-Patches/0008-Check-Paper-versions.patch +++ b/Spigot-API-Patches/0008-Check-Paper-versions.patch @@ -1,11 +1,11 @@ -From d9b95019ce4ca79338a34067bd0b6ea22ddd245d Mon Sep 17 00:00:00 2001 +From f62031b4b496b560ba5e5229eba8202def54c924 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 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 @@ -28,6 +28,11 @@ 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 { @@ -148,5 +148,5 @@ index 760d58eb..aae605e9 100644 + // Paper end } -- -2.11.1.windows.1 +2.17.0.windows.1 diff --git a/Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch b/Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch index 9da20f51a1..e6b305ad21 100644 --- a/Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch +++ b/Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch @@ -1,4 +1,4 @@ -From 37e2bacf63a44311cddcf163a91f269e0b473008 Mon Sep 17 00:00:00 2001 +From 1e93486b23234fe77e28702c767735e6e1bc4c77 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 20:26:39 -0600 Subject: [PATCH] Fix ServerListPingEvent flagging as Async @@ -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 eb00d6a..70416c8 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 @@ -1,9 +1,19 @@ @@ -30,7 +30,7 @@ index eb00d6a..70416c8 100644 + // 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 343f238..3c38d85 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 @@ -21,6 +21,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable @@ -50,5 +50,5 @@ index 343f238..3c38d85 100644 this.address = address; this.motd = motd; -- -2.9.2.windows.1 +2.17.0.windows.1