core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-API-Patches/0194-Expose-MinecraftServer...

48 lines
1.5 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears 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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-01 22:03:47 +00:00
From 165e8827e1cd5f52e5bed17d42f8ab2fbe99450d Mon Sep 17 00:00:00 2001
Add API MinecraftServer#isStopping (#3129)
2020-04-11 05:51:35 +00:00
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
Use dedicated thread for main thread blocking chunk loads In most cases, this change won't benefit much. However, there exists the possibility that your Chunk Task threads are all busy doing super slow work such as converting chunks. If this occurs, the main thread blocking tasks, even at highest priority, has to wait for some thread to become available. This change gives us a waiting thread used only for main thread blocking tasks, as well as an increased thread priority level, so that the OS will give priority to this thread over the other threads. This is more about guarantees, and won't be any real performanc boost to anyone who has low or fast activity on their chunk tasks anyways. But not all of us force upgrade our worlds, and this can be a life saver. also reordered some patches because multiple PR's were merged.
2020-04-11 08:40:00 +00:00
index c3c2d9c6b..ea3e5d6fa 100644
Add API MinecraftServer#isStopping (#3129)
2020-04-11 05:51:35 +00:00
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
Use dedicated thread for main thread blocking chunk loads In most cases, this change won't benefit much. However, there exists the possibility that your Chunk Task threads are all busy doing super slow work such as converting chunks. If this occurs, the main thread blocking tasks, even at highest priority, has to wait for some thread to become available. This change gives us a waiting thread used only for main thread blocking tasks, as well as an increased thread priority level, so that the OS will give priority to this thread over the other threads. This is more about guarantees, and won't be any real performanc boost to anyone who has low or fast activity on their chunk tasks anyways. But not all of us force upgrade our worlds, and this can be a life saver. also reordered some patches because multiple PR's were merged.
2020-04-11 08:40:00 +00:00
@@ -1680,6 +1680,15 @@ public final class Bukkit {
Add API MinecraftServer#isStopping (#3129)
2020-04-11 05:51:35 +00:00
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
Use dedicated thread for main thread blocking chunk loads In most cases, this change won't benefit much. However, there exists the possibility that your Chunk Task threads are all busy doing super slow work such as converting chunks. If this occurs, the main thread blocking tasks, even at highest priority, has to wait for some thread to become available. This change gives us a waiting thread used only for main thread blocking tasks, as well as an increased thread priority level, so that the OS will give priority to this thread over the other threads. This is more about guarantees, and won't be any real performanc boost to anyone who has low or fast activity on their chunk tasks anyways. But not all of us force upgrade our worlds, and this can be a life saver. also reordered some patches because multiple PR's were merged.
2020-04-11 08:40:00 +00:00
index bfa83c9bb..9ceaac0e8 100644
Add API MinecraftServer#isStopping (#3129)
2020-04-11 05:51:35 +00:00
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
Use dedicated thread for main thread blocking chunk loads In most cases, this change won't benefit much. However, there exists the possibility that your Chunk Task threads are all busy doing super slow work such as converting chunks. If this occurs, the main thread blocking tasks, even at highest priority, has to wait for some thread to become available. This change gives us a waiting thread used only for main thread blocking tasks, as well as an increased thread priority level, so that the OS will give priority to this thread over the other threads. This is more about guarantees, and won't be any real performanc boost to anyone who has low or fast activity on their chunk tasks anyways. But not all of us force upgrade our worlds, and this can be a life saver. also reordered some patches because multiple PR's were merged.
2020-04-11 08:40:00 +00:00
@@ -1470,5 +1470,12 @@ public interface Server extends PluginMessageRecipient {
Add API MinecraftServer#isStopping (#3129)
2020-04-11 05:51:35 +00:00
* @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
}
--
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears 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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-01 22:03:47 +00:00
2.26.2
Add API MinecraftServer#isStopping (#3129)
2020-04-11 05:51:35 +00:00