Updated Upstream (Bukkit/CraftBukkit)

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:
214b9f14 SPIGOT-6605: Add method to access value of enforce-whitelist

CraftBukkit Changes:
b121d3b9 SPIGOT-6605: Add method to access value of enforce-whitelist
This commit is contained in:
Shane Freeder 2021-06-29 01:31:35 +01:00
parent 143f38113e
commit 3aae7ef01a
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
42 changed files with 151 additions and 151 deletions

View file

@ -520,10 +520,10 @@ index 0000000000000000000000000000000000000000..659193fc0596084031c09aa47fbb428a
+ @Deprecated GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 847ba5143660d5c56ff8f2cae2169a51b8927757..17553703d6dcb0c7852cc35b08da05075af435f2 100644
index ca3690c502f0b269e13ebefa9797140a8243cc92..260f5432e979a19af23fa3150c3b5752ee269faf 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1867,6 +1867,16 @@ public final class Bukkit {
@@ -1891,6 +1891,16 @@ public final class Bukkit {
public static boolean isStopping() {
return server.isStopping();
}
@ -541,10 +541,10 @@ index 847ba5143660d5c56ff8f2cae2169a51b8927757..17553703d6dcb0c7852cc35b08da0507
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e6b62ba32e089e2fd8563ec8430b72196f6680e0..0a109e9157d9a9f15f71d2fa96d31b7f8eb3fde2 100644
index 6d313381c7aeb1cdc0e20bd4517af71b0897f886..6698320d76201b28811472a3185ddf129931bd3d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1638,5 +1638,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1658,5 +1658,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return true if server is in the process of being shutdown
*/
boolean isStopping();