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.
This commit is contained in:
Zach Brown 2018-04-09 16:13:08 -04:00
parent 344a125dc1
commit d4c3e49a06
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
2 changed files with 8 additions and 8 deletions

View File

@ -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 <zach.brown@destroystokyo.com>
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

View File

@ -1,4 +1,4 @@
From 37e2bacf63a44311cddcf163a91f269e0b473008 Mon Sep 17 00:00:00 2001
From 1e93486b23234fe77e28702c767735e6e1bc4c77 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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<Player>
@ -50,5 +50,5 @@ index 343f238..3c38d85 100644
this.address = address;
this.motd = motd;
--
2.9.2.windows.1
2.17.0.windows.1