From 817550c5204f752e0a5dc05ff26320560058a911 Mon Sep 17 00:00:00 2001 From: Abel <56084910+Abelkrijgtalles@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:53:01 +0100 Subject: [PATCH] Add API to allow/disallow tick sleeping (#11611) --- ...-API-to-allow-disallow-tick-sleeping.patch | 25 +++++++ ...-API-to-allow-disallow-tick-sleeping.patch | 67 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 patches/api/0499-API-to-allow-disallow-tick-sleeping.patch create mode 100644 patches/server/1069-API-to-allow-disallow-tick-sleeping.patch diff --git a/patches/api/0499-API-to-allow-disallow-tick-sleeping.patch b/patches/api/0499-API-to-allow-disallow-tick-sleeping.patch new file mode 100644 index 000000000000..a199e4e43d7a --- /dev/null +++ b/patches/api/0499-API-to-allow-disallow-tick-sleeping.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Abel +Date: Tue, 12 Nov 2024 22:25:35 +0100 +Subject: [PATCH] API to allow/disallow tick sleeping + + +diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java +index ba366576a571214e67bcc529dc1bca19e1d59ef8..f55638eb8b315864052f9fe17ab4846e5e9d8dbb 100644 +--- a/src/main/java/org/bukkit/Server.java ++++ b/src/main/java/org/bukkit/Server.java +@@ -2578,5 +2578,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + * Returns whether the server is sleeping/paused. + */ + boolean isPaused(); ++ ++ /** ++ * Allows or disallows the server to sleep/pause. ++ * If any plugin disallows pausing, the server will never pause. ++ * ++ * @param plugin The {@link org.bukkit.plugin.Plugin} that's allowing or disallowing pausing. ++ * @param value Whether to allow sleeping of the server (defaults to true). ++ */ ++ void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value); + // Paper end - API to check if the server is sleeping + } diff --git a/patches/server/1069-API-to-allow-disallow-tick-sleeping.patch b/patches/server/1069-API-to-allow-disallow-tick-sleeping.patch new file mode 100644 index 000000000000..73f6bf3d0115 --- /dev/null +++ b/patches/server/1069-API-to-allow-disallow-tick-sleeping.patch @@ -0,0 +1,67 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Abel +Date: Tue, 12 Nov 2024 22:25:20 +0100 +Subject: [PATCH] API to allow/disallow tick sleeping + + +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index 5d070f036dae6d93f863c55192b557419634456d..663b4ecd520e82aa108d44f2d5c2a20cfc7bc01f 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -332,6 +332,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop pluginsBlockingSleep = new ArrayList<>(); // Paper - API to allow/disallow tick sleeping + + public static S spin(Function serverFactory) { + AtomicReference atomicreference = new AtomicReference(); +@@ -1623,8 +1624,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0) { +- if (this.playerList.getPlayerCount() == 0 && !this.tickRateManager.isSprinting()) { ++ if (this.playerList.getPlayerCount() == 0 && !this.tickRateManager.isSprinting() && this.pluginsBlockingSleep.isEmpty()) { // Paper - API to allow/disallow tick sleeping + ++this.emptyTicks; + } else { + this.emptyTicks = 0; +@@ -3191,5 +3193,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.emptyTicks >= this.pauseWhileEmptySeconds() * 20; + } ++ ++ public void addPluginAllowingSleep(final String pluginName, final boolean value) { ++ if (!value) { ++ this.pluginsBlockingSleep.add(pluginName); ++ } else { ++ this.pluginsBlockingSleep.remove(pluginName); ++ } ++ } ++ ++ private void removeDisabledPluginsBlockingSleep() { ++ if (this.pluginsBlockingSleep.isEmpty()) { ++ return; ++ } ++ this.pluginsBlockingSleep.removeIf(plugin -> ( ++ !io.papermc.paper.plugin.manager.PaperPluginManagerImpl.getInstance().isPluginEnabled(plugin) ++ )); ++ } + // Paper end - API to check if the server is sleeping + } +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index 605662917a7720a6c5134fd1d93aa2d26116b76d..cac8592e3a2f438fe9ca167a4fdcd65152bbb2de 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -3252,5 +3252,10 @@ public final class CraftServer implements Server { + public boolean isPaused() { + return this.console.isTickPaused(); + } ++ ++ @Override ++ public void allowPausing(final Plugin plugin, final boolean value) { ++ this.console.addPluginAllowingSleep(plugin.getName(), value); ++ } + // Paper end - API to check if the server is sleeping + }