Initial work on 1.14 pre-5
This commit is contained in:
@@ -1,15 +1,15 @@
|
||||
From 1bc123f10d8aefd48085360b80c7daee9945ec04 Mon Sep 17 00:00:00 2001
|
||||
From c95ac122794bd807e5332c5f847746209cb18a7a 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 b8126985d..73d258763 100644
|
||||
index cbce5244..5a1f9504 100644
|
||||
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||
@@ -28,6 +28,14 @@ import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
@@ -25,6 +25,14 @@ import org.bukkit.plugin.PluginDescriptionFile;
|
||||
import org.bukkit.util.StringUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
+// Paper start
|
||||
@@ -23,7 +23,7 @@ index b8126985d..73d258763 100644
|
||||
public class VersionCommand extends BukkitCommand {
|
||||
public VersionCommand(@NotNull String name) {
|
||||
super(name);
|
||||
@@ -153,7 +161,7 @@ public class VersionCommand extends BukkitCommand {
|
||||
@@ -150,7 +158,7 @@ public class VersionCommand extends BukkitCommand {
|
||||
|
||||
private void sendVersion(@NotNull CommandSender sender) {
|
||||
if (hasVersion) {
|
||||
@@ -32,7 +32,7 @@ index b8126985d..73d258763 100644
|
||||
lastCheck = System.currentTimeMillis();
|
||||
hasVersion = false;
|
||||
} else {
|
||||
@@ -184,24 +192,28 @@ public class VersionCommand extends BukkitCommand {
|
||||
@@ -181,24 +189,28 @@ public class VersionCommand extends BukkitCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ index b8126985d..73d258763 100644
|
||||
version = version.substring("git-Bukkit-".length());
|
||||
int cbVersions = getDistance("craftbukkit", version.substring(0, version.indexOf(' ')));
|
||||
if (cbVersions == -1) {
|
||||
@@ -234,8 +246,16 @@ public class VersionCommand extends BukkitCommand {
|
||||
@@ -231,8 +243,16 @@ public class VersionCommand extends BukkitCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ index b8126985d..73d258763 100644
|
||||
BufferedReader reader = Resources.asCharSource(
|
||||
new URL("https://hub.spigotmc.org/stash/rest/api/1.0/projects/SPIGOT/repos/" + repo + "/commits?since=" + URLEncoder.encode(hash, "UTF-8") + "&withCounts=true"),
|
||||
Charsets.UTF_8
|
||||
@@ -249,9 +269,57 @@ public class VersionCommand extends BukkitCommand {
|
||||
@@ -246,9 +266,57 @@ public class VersionCommand extends BukkitCommand {
|
||||
} finally {
|
||||
reader.close();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user