mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
papermc/Spigot-Server-Patches/0464-Expose-MinecraftServer-isRunning.patch

26 lines
948 B
Diff
Raw Normal View History

Remove patch for MC-111480, fixed in 1.14 We were now starting entities at ID 2
2020-04-12 00:39:21 +00:00
From 54f024d408679baaaaad219aeb853145ca144554 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:12 -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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.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 53b71b7915..1a3c6aae18 100644
Add API MinecraftServer#isStopping (#3129)
2020-04-11 05:51:35 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.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
@@ -2217,5 +2217,10 @@ public final class CraftServer implements Server {
Add API MinecraftServer#isStopping (#3129)
2020-04-11 05:51:35 +00:00
public int getCurrentTick() {
return net.minecraft.server.MinecraftServer.currentTick;
}
+
+ @Override
+ public boolean isStopping() {
+ return !net.minecraft.server.MinecraftServer.getServer().isRunning();
+ }
// Paper end
}
--
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
2.25.1
Add API MinecraftServer#isStopping (#3129)
2020-04-11 05:51:35 +00:00
Reference in a new issue Copy permalink