Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 20:46:59 +01:00
Code Issues Projects Releases Wiki Activity

make version command track the correct version

Browse Source
This commit is contained in:
Shane Freeder 2019-05-07 16:45:01 +01:00
parent 39bcf78e87
commit 521276836f
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From c95ac122794bd807e5332c5f847746209cb18a7a Mon Sep 17 00:00:00 2001
From e3823b8eaaa1f54104e13a283aab7a682fdb6cdb 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 cbce5244..5a1f9504 100644
index cbce52444..4f9042e23 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -25,6 +25,14 @@ import org.bukkit.plugin.PluginDescriptionFile;
@ -101,7 +101,7 @@ index cbce5244..5a1f9504 100644
+ private static int getFromJenkins(int currentVer) {
+ try {
+ BufferedReader reader = Resources.asCharSource(
+ new URL("https://ci.destroystokyo.com/job/Paper-1.13/lastSuccessfulBuild/buildNumber"), // Paper
+ new URL("https://ci.destroystokyo.com/job/Paper-1.14/lastSuccessfulBuild/buildNumber"), // Paper
+ Charsets.UTF_8
+ ).openBufferedStream();
+ try {

22
Spigot-API-Patches/0184-Temp-track-ver-1.14-for-version-command.patch Normal file
View File

@ -0,0 +1,22 @@
From a5beefed41fd637dfed924034905e153109a350b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 7 May 2019 16:44:03 +0100
Subject: [PATCH] Temp track ver/1.14 for version command
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index 27f0cadd9..ece8d1c8a 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -268,7 +268,7 @@ public class VersionCommand extends BukkitCommand {
return getFromJenkins(currentVer);
} catch (NumberFormatException ex) {
verInfo = verInfo.replace("\"", "");
- return getFromRepo("PaperMC/Paper", "master", verInfo);
+ return getFromRepo("PaperMC/Paper", "ver/1.14", verInfo); // Just for now
}
/*
BufferedReader reader = Resources.asCharSource(
--
2.21.0