twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-17 21:33:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update branch name for GitHub version checking

Browse Source
This commit is contained in:
Zach Brown
2018-09-13 12:17:01 -04:00
parent 1729151c19
commit 9ff95e76f7
30 changed files with 53 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Spigot-API-Patches/Check-Paper-versions.patch
View File

@@ -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..044361af 100644
index 760d58eb..52952aa4 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;
@@ -82,7 +82,7 @@ index 760d58eb..044361af 100644
+ return getFromJenkins(currentVer);
+ } catch (NumberFormatException ex) {
+ verInfo = verInfo.replace("\"", "");
+ return getFromRepo("PaperMC/Paper", verInfo);
+ return getFromRepo("PaperMC/Paper", "master", verInfo);
+ }
+ /*
BufferedReader reader = Resources.asCharSource(
@@ -98,7 +98,7 @@ index 760d58eb..044361af 100644
+ private static int getFromJenkins(int currentVer) {
+ try {
+ BufferedReader reader = Resources.asCharSource(
+ new URL("https://ci.destroystokyo.com/job/Paper/lastSuccessfulBuild/buildNumber"), // Paper
+ new URL("https://ci.destroystokyo.com/job/Paper-1.13/lastSuccessfulBuild/buildNumber"), // Paper
+ Charsets.UTF_8
+ ).openBufferedStream();
+ try {
@@ -117,10 +117,9 @@ index 760d58eb..044361af 100644
+ }
+
+ // Contributed by Techcable <Techcable@outlook.com> in GH PR #65
+ private static final String BRANCH = "master";
+ private static int getFromRepo(String repo, String hash) {
+ private static int getFromRepo(String repo, String branch, String hash) {
+ try {
+ HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + BRANCH + "..." + hash).openConnection();
+ HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection();
+ connection.connect();
+ if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return -2; // Unknown commit
+ try (