Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
This commit is contained in:
@@ -5,7 +5,7 @@ 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 5a994953..f38f6864 100644
|
||||
index 0305548e..8e57aa91 100644
|
||||
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||
@@ -0,0 +0,0 @@ import org.json.simple.JSONObject;
|
||||
@@ -18,11 +18,11 @@ index 5a994953..f38f6864 100644
|
||||
+// Paper end
|
||||
+
|
||||
public class VersionCommand extends BukkitCommand {
|
||||
public VersionCommand(String name) {
|
||||
public VersionCommand(@NotNull String name) {
|
||||
super(name);
|
||||
@@ -0,0 +0,0 @@ public class VersionCommand extends BukkitCommand {
|
||||
|
||||
private void sendVersion(CommandSender sender) {
|
||||
private void sendVersion(@NotNull CommandSender sender) {
|
||||
if (hasVersion) {
|
||||
- if (System.currentTimeMillis() - lastCheck > 21600000) {
|
||||
+ if (System.currentTimeMillis() - lastCheck > 7200000) { // Paper - Lower to 2 hours
|
||||
@@ -74,9 +74,9 @@ index 5a994953..f38f6864 100644
|
||||
}
|
||||
}
|
||||
|
||||
- private static int getDistance(String repo, String hash) {
|
||||
- private static int getDistance(@NotNull String repo, @NotNull String hash) {
|
||||
+ // Paper start
|
||||
+ private static int getDistance(String repo, String verInfo) {
|
||||
+ private static int getDistance(@NotNull String repo, @NotNull String verInfo) {
|
||||
try {
|
||||
+ int currentVer = Integer.decode(verInfo);
|
||||
+ return getFromJenkins(currentVer);
|
||||
|
||||
Reference in New Issue
Block a user