Reorder some patches
This commit is contained in:
parent
a02874e014
commit
57dfcdf4eb
164 changed files with 28 additions and 28 deletions
|
@ -1,44 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: JRoy <joshroy126@gmail.com>
|
||||
Date: Fri, 10 Apr 2020 21:24:35 -0400
|
||||
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 3fb45f03f3901de5592e2bb6ba8f75b5fd474509..5d5f1e52f2ff19a48776a4fdbd026d67e538bec9 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -2219,6 +2219,15 @@ public final class Bukkit {
|
||||
public static int getCurrentTick() {
|
||||
return server.getCurrentTick();
|
||||
}
|
||||
+
|
||||
+ /**
|
||||
+ * Checks if the server is in the process of being shutdown.
|
||||
+ *
|
||||
+ * @return true if server is in the process of being shutdown
|
||||
+ */
|
||||
+ public static boolean isStopping() {
|
||||
+ return server.isStopping();
|
||||
+ }
|
||||
// Paper end
|
||||
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 6fe653a2a0fd4f07d39ed584bc11688d4926d54e..d59a7e0c9ec50040fb0b2cc3239cae46760aba04 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1949,5 +1949,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
* @return Current tick
|
||||
*/
|
||||
int getCurrentTick();
|
||||
+
|
||||
+ /**
|
||||
+ * Checks if the server is in the process of being shutdown.
|
||||
+ *
|
||||
+ * @return true if server is in the process of being shutdown
|
||||
+ */
|
||||
+ boolean isStopping();
|
||||
// Paper end
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue