Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-07-05 03:04:51 +02:00
Code Issues Projects Releases Wiki Activity

Remove 1.12 prerelease changes patch

Browse Source
This commit is contained in:
Zach Brown 2017-06-08 17:19:12 -05:00
parent 867ddc4ebb
commit 5e40806ee2
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Spigot-API-Patches/0051-1.12-prerelease-versioning-change-and-warning.patch
View File

@ -1,31 +0,0 @@
From bd06f97c046b55140b8feb68b622844e96dc395a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 15 May 2017 10:11:42 -0500
Subject: [PATCH] 1.12 prerelease versioning change and warning
Remove when merged to master
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index aae605e9..2319d6b5 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -48,6 +48,7 @@ public class VersionCommand extends BukkitCommand {
if (!testPermission(sender)) return true;
if (args.length == 0) {
+ sender.sendMessage("This is pre-release software"); // TODO: Remove during merge into master
sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
sendVersion(sender);
} else {
@@ -289,7 +290,7 @@ public class VersionCommand extends BukkitCommand {
}
// Contributed by Techcable <Techcable@outlook.com> in GH PR #65
- private static final String BRANCH = "master";
+ private static final String BRANCH = "pre/1.12"; // TODO: Switch back to master
private static int getFromRepo(String repo, String hash) {
try {
HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + BRANCH + "..." + hash).openConnection();
--
2.13.0.windows.1