From 8dc42fadfa85c772ab06e23f21573e8e56d147b1 Mon Sep 17 00:00:00 2001 From: Abel <56084910+Abelkrijgtalles@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:22:20 +0100 Subject: [PATCH] Add API to check if the server is sleeping (#11605) --- ...I-to-check-if-the-server-is-sleeping.patch | 22 +++++++++++ ...I-to-check-if-the-server-is-sleeping.patch | 37 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 patches/api/0498-API-to-check-if-the-server-is-sleeping.patch create mode 100644 patches/server/1068-API-to-check-if-the-server-is-sleeping.patch diff --git a/patches/api/0498-API-to-check-if-the-server-is-sleeping.patch b/patches/api/0498-API-to-check-if-the-server-is-sleeping.patch new file mode 100644 index 0000000000..219c527547 --- /dev/null +++ b/patches/api/0498-API-to-check-if-the-server-is-sleeping.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Abel +Date: Sun, 10 Nov 2024 16:32:51 +0100 +Subject: [PATCH] API to check if the server is sleeping + + +diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java +index 0b78564256ebc647ebac402e549d86ab6e307c8d..ba366576a571214e67bcc529dc1bca19e1d59ef8 100644 +--- a/src/main/java/org/bukkit/Server.java ++++ b/src/main/java/org/bukkit/Server.java +@@ -2572,4 +2572,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + */ + boolean isOwnedByCurrentRegion(@NotNull Entity entity); + // Paper end - Folia region threading API ++ ++ // Paper start - API to check if the server is sleeping ++ /** ++ * Returns whether the server is sleeping/paused. ++ */ ++ boolean isPaused(); ++ // Paper end - API to check if the server is sleeping + } diff --git a/patches/server/1068-API-to-check-if-the-server-is-sleeping.patch b/patches/server/1068-API-to-check-if-the-server-is-sleeping.patch new file mode 100644 index 0000000000..ac432cd932 --- /dev/null +++ b/patches/server/1068-API-to-check-if-the-server-is-sleeping.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Abel +Date: Sun, 10 Nov 2024 16:32:34 +0100 +Subject: [PATCH] API to check if the server is sleeping + + +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index 64b56abf8900d0424100da460fc68ac964394793..5d070f036dae6d93f863c55192b557419634456d 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -3186,4 +3186,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.emptyTicks >= this.pauseWhileEmptySeconds() * 20; ++ } ++ // 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 806e56cb60235a99f468d36a059fdbd54c2d46e3..605662917a7720a6c5134fd1d93aa2d26116b76d 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -3246,4 +3246,11 @@ public final class CraftServer implements Server { + return this.potionBrewer; + } + // Paper end ++ ++ // Paper start - API to check if the server is sleeping ++ @Override ++ public boolean isPaused() { ++ return this.console.isTickPaused(); ++ } ++ // Paper end - API to check if the server is sleeping + }