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/0193-Expose-MinecraftServer-isRunning.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9a5888032602616996a27aa93dbe3b89356acd05..eb82ccb5923847bbb48972e8145a12cb5dcedd17 100644
index 86a9db588b1009d10e66f8e6a5aca7929148d227..fea11d016dc1b2c585ded4fbcbcf5b405b78712f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1939,6 +1939,15 @@ public final class Bukkit {
@@ -1980,6 +1980,15 @@ public final class Bukkit {
public static int getCurrentTick() {
return server.getCurrentTick();
}
@ -26,10 +26,10 @@ index 9a5888032602616996a27aa93dbe3b89356acd05..eb82ccb5923847bbb48972e8145a12cb
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 685b4af3a0a041c4c65e3435f42ab83d2feb5d4e..300779fe31a71be182edde10fd3beac812fae504 100644
index c51860ac56d60c08ba9a06dd70c6860dccd4c490..98d683761fcd5dffcce8c08aeae369ab2e2e5665 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1704,5 +1704,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1740,5 +1740,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return Current tick
*/
int getCurrentTick();