Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 01:17:44 +01:00
Code Issues Projects Releases Wiki Activity

Use 1.13 branch and builds for versioning

Browse Source
This commit is contained in:
Zach Brown 2018-07-19 17:33:29 -05:00
parent 0030708509
commit 09663381ca
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Spigot-API-Patches/0124-Use-specific-1.13-versioning-branch-build-name.patch Normal file
View File

@ -0,0 +1,44 @@
From 07605531827fe881188f2dc08385c6a82b23215f Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 19 Jul 2018 17:32:47 -0500
Subject: [PATCH] Use specific 1.13 versioning branch/build name
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index c45faf4c..7041085c 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -266,7 +266,7 @@ public class VersionCommand extends BukkitCommand {
return getFromJenkins(currentVer);
} catch (NumberFormatException ex) {
verInfo = verInfo.replace("\"", "");
- return getFromRepo("PaperMC/Paper", verInfo);
+ return getFromRepo("PaperMC/Paper", "pre/1.13", verInfo);
}
/*
BufferedReader reader = Resources.asCharSource(
@@ -288,7 +288,7 @@ public class VersionCommand extends BukkitCommand {
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 {
@@ -307,10 +307,9 @@ public class VersionCommand extends BukkitCommand {
}
// 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 (
--
2.17.1