31 lines
1.6 KiB
Diff
31 lines
1.6 KiB
Diff
From eabf0ce918f79ef14c00b9d9c69ba3ddba349feb 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-pre2 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..d7e3d7f4 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, and is not necessarily of the same quality as a full release"); // 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
|
|
|