From 5e40806ee260d12b4b0572b366f4d9a5b53bef76 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 8 Jun 2017 17:19:12 -0500 Subject: [PATCH] Remove 1.12 prerelease changes patch --- ...elease-versioning-change-and-warning.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 Spigot-API-Patches/0051-1.12-prerelease-versioning-change-and-warning.patch diff --git a/Spigot-API-Patches/0051-1.12-prerelease-versioning-change-and-warning.patch b/Spigot-API-Patches/0051-1.12-prerelease-versioning-change-and-warning.patch deleted file mode 100644 index 0eabcd5bd..000000000 --- a/Spigot-API-Patches/0051-1.12-prerelease-versioning-change-and-warning.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bd06f97c046b55140b8feb68b622844e96dc395a Mon Sep 17 00:00:00 2001 -From: Zach Brown -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 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 -