Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
64c8bd39 #679: Add getHideOnlinePlayers
b991b6c7 #677: Add "Allow Server Listings" API
4e9f199a SPIGOT-6801: Wrong BlockData classes in Material enum for SOUL_FIRE and SOUL_TORCH

CraftBukkit Changes:
37e63e63 Fix loading / creating secondary worlds (nether/end)
4bf7f33c #956: Add getHideOnlinePlayers
d181e1ed Fix serializing unhandled NBT + add unit test with unhandled NBT
aebb79e3 #954: Add "Allow Server Listings" API
7c4707e4 #955: Add test for BlockData class of Material

Spigot Changes:
16c0cb41 Rebuild patches
This commit is contained in:
MiniDigger 2021-11-23 06:49:33 +01:00 committed by MiniDigger | Martin
parent c93f56ac1c
commit 79b873c901
36 changed files with 137 additions and 137 deletions

View file

@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 53943694e5e405da02f784e9cff706bc594ae9b0..cd00a5b384413dc74b7d500155765e9df64b534f 100644
index 308d9cd655c37e8a00bb053ecd2ba2450555158f..356a270e9f831e21dc7fd947c2bec72e0840145a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1888,6 +1888,15 @@ public final class Bukkit {
@@ -1897,6 +1897,15 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@ -26,10 +26,10 @@ index 53943694e5e405da02f784e9cff706bc594ae9b0..cd00a5b384413dc74b7d500155765e9d
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6abf31ba07c6973eae6eca1f0d4e352f400a6640..e6ce7b4de58a3d4ec5293d26637a0e6468bacc32 100644
index 51d7ec1b9ede6a1fe11d1bddc7a58213add72cbc..c0bd764744b101856ef4fa068b5218688b156ecf 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1665,4 +1665,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1672,4 +1672,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Spigot end
void reloadPermissions(); // Paper