From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Abel <abelvanhulst@gmail.com> 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..c26e3a239441376f2694782d4f07943538677c71 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<TickTa public volatile Thread shutdownThread; // Paper public volatile boolean abnormalExit = false; // Paper public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation + private final Set<String> pluginsBlockingSleep = new java.util.HashSet<>(); // Paper - API to allow/disallow tick sleeping public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) { AtomicReference<S> atomicreference = new AtomicReference(); @@ -1623,8 +1624,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa long i = Util.getNanos(); int j = this.pauseWhileEmptySeconds() * 20; + this.removeDisabledPluginsBlockingSleep(); // Paper - API to allow/disallow tick sleeping if (j > 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<TickTa public boolean isTickPaused() { return this.emptyTicks > 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 7afc3d4244c096f78d48338da2eb65c4e834b6f1..ac8af406180bc680d46e8edc3da0fc2e5211345a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -3264,5 +3264,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 }