Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5b53cb4 [ci skip] use more jspecify in server
PaperMC/Paper@a63013c [ci skip] fix compile issues caused by 5b53cb4 (#11664)
PaperMC/Paper@cd9e697 Bump dawidd6/action-download-artifact from 3 to 6 in /.github/workflows (#11666)
PaperMC/Paper@280b497 Change MinecraftServer#pluginsBlockingSleep to be Set
PaperMC/Paper@4190ee7 Add Server#isGlobalTickThread
PaperMC/Paper@5f0932b [ci skip] leaf
This commit is contained in:
granny
2024-11-25 16:56:53 -08:00
parent 55d4309e5c
commit 0601f870d4
12 changed files with 38 additions and 38 deletions

View File

@@ -17,10 +17,10 @@ index c3ec370b83b895be0f03662e3884fa4a2442a2a6..05e16103af3fd276f0196ddf1a2e5b72
public final boolean allowFlight = this.get("allow-flight", false);
public final String motd = this.get("motd", "A Minecraft Server");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 04f4d70f6b278b2ec3a94cb104f4a4497a9ba4bf..6bf7b4dcee4258cd9c23d2cf2eac5194a03f73e3 100644
index 48a8bdd45c063797144e98e76f6007ae9025124e..96f0ff6877e2959fe1ab26728ee64b9c9b777d26 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3273,4 +3273,11 @@ public final class CraftServer implements Server {
@@ -3285,4 +3285,11 @@ public final class CraftServer implements Server {
this.console.addPluginAllowingSleep(plugin.getName(), value);
}
// Paper end - API to check if the server is sleeping