mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
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:
8f495b8d #564: Add method to get max world size

CraftBukkit Changes:
768d7fc2d #773: Add method to get max world size

Spigot Changes:
628435a8 #103: Add async catchers to Chunk#getEntities
This commit is contained in:
Aikar 2020-12-12 19:42:05 -05:00
parent 31ac45a0a2
commit 9c9583cd2b
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
52 changed files with 151 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
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 c10165f9fc2317a29c3bef7fa0dc0e308f64b7aa..dbf14b0953c254a677ad134e524607b2a057f36e 100644
index ffa6be2424774960e36288d02f06d591e30d49d0..84ac91aa533f9c3e5c1e9107404fda5ec519ca02 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1624,6 +1624,15 @@ public final class Bukkit {
@@ -1633,6 +1633,15 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@ -26,10 +26,10 @@ index c10165f9fc2317a29c3bef7fa0dc0e308f64b7aa..dbf14b0953c254a677ad134e524607b2
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c0fd1543a902cf4ff28207b5786af69fbe94a468..9e90a69ad2231c4d2d4c778b9a3095e908f22f1e 100644
index 7b2eb7b8a77a4ca8ae6e4e8c66597f83627bd199..75800dc49b66c240da92430f1defc9f63966e0b6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1427,4 +1427,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1434,4 +1434,6 @@ public interface Server extends PluginMessageRecipient {
// Spigot end
void reloadPermissions(); // Paper