Rebase... again

This commit is contained in:
Abel 2024-11-21 20:21:24 +01:00
parent 3006ea895a
commit 26cdf0f881
No known key found for this signature in database
GPG key ID: B4E662E8856D4F89
2 changed files with 1 additions and 1 deletions

View file

@ -20,7 +20,7 @@ index 64b56abf8900d0424100da460fc68ac964394793..1c6194f68e5f8b9f3a2440176322b448
+ // 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 dfddcfb1fe1679adaecf75375757dca720e76ce1..024ddd1996c18cd86aacb58f26a76adfc2934e85 100644
index 806e56cb60235a99f468d36a059fdbd54c2d46e3..a9ed927b6d3da8565a76a7b515753e346c12a365 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 {