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

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722)

Browse source
This commit is contained in:
Jason 2021-10-04 22:14:11 -05:00 • committed by GitHub
parent 90f717fa5a
commit a3dfe6dca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
365 changed files with 725 additions and 732 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/api/0202-Add-Mob-Goal-API.patch
View file

@ -520,10 +520,10 @@ index 0000000000000000000000000000000000000000..fb0c77c66ca117eaff9487a41f1e280a
+ @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 eb82ccb5923847bbb48972e8145a12cb5dcedd17..efcbc1e667fab15a55fe44b234dc9713aec895f2 100644
index fea11d016dc1b2c585ded4fbcbcf5b405b78712f..ea67d9e95f0c9ca0b0ae3afba67563e43743abec 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1948,6 +1948,16 @@ public final class Bukkit {
@@ -1989,6 +1989,16 @@ public final class Bukkit {
public static boolean isStopping() {
return server.isStopping();
}
@ -541,10 +541,10 @@ index eb82ccb5923847bbb48972e8145a12cb5dcedd17..efcbc1e667fab15a55fe44b234dc9713
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 300779fe31a71be182edde10fd3beac812fae504..b666d5f03bfb5cc91570688382f541498dd1a1c5 100644
index 98d683761fcd5dffcce8c08aeae369ab2e2e5665..451a75c2716b23ca61ff53927d594034493da359 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1711,5 +1711,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1747,5 +1747,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return true if server is in the process of being shutdown
*/
boolean isStopping();