From c3bd6c65c62efebd3899670ad69f2345bc9b60cb Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 16 Jan 2021 02:46:43 +0000 Subject: [PATCH] Updated Upstream (Bukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b94b766f Improve /version command --- Spigot-API-Patches/Version-Command-2.0.patch | 7 +++---- work/Bukkit | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Spigot-API-Patches/Version-Command-2.0.patch b/Spigot-API-Patches/Version-Command-2.0.patch index 04326858ea..2b3c93ca16 100644 --- a/Spigot-API-Patches/Version-Command-2.0.patch +++ b/Spigot-API-Patches/Version-Command-2.0.patch @@ -124,16 +124,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private void obtainVersion() { String version = Bukkit.getVersion(); -- if (version == null) version = "Custom"; + // Paper start + if (version.startsWith("null")) { // running from ide? + setVersionMessage("Unknown version, custom build?"); + return; + } + /* - if (version.startsWith("git-Spigot-")) { - String[] parts = version.substring("git-Spigot-".length()).split("-"); - int cbVersions = getDistance("craftbukkit", parts[1].substring(0, parts[1].indexOf(' '))); + if (version == null) version = "Custom"; + String[] parts = version.substring(0, version.indexOf(' ')).split("-"); + if (parts.length == 4) { @@ -0,0 +0,0 @@ public class VersionCommand extends BukkitCommand { } else { setVersionMessage("Unknown version, custom build?"); diff --git a/work/Bukkit b/work/Bukkit index 85b16b8a5f..b94b766f22 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 85b16b8a5f044eb8d38375c23e8968641d18a933 +Subproject commit b94b766f2285a5b55720a8aa72605e2e64b0330a