Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9301)

2023-06-12 16:51:45 -07:00 · 2023-06-12 16:51:45 -07:00 · c287e921a9
commit c287e921a9
parent b48e2e352e
904 changed files with 1598 additions and 1695 deletions
--- a/patches/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch
@ -0,0 +1,117 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BuildTools <46540330+willkroboth@users.noreply.github.com>
+Date: Fri, 19 Aug 2022 16:11:51 -0400
+Subject: [PATCH] Add method isTickingWorlds() to Bukkit.
+
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index ac6a49e39790aa9f12c7d98990f4cac297200cb0..ef36d793ab77c7b7208f8f5994815599cff470d1 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -774,12 +774,26 @@ public final class Bukkit {
+         return server.getWorlds();
+     }
+ 
+    // Paper start
+    /**
+     * Gets whether the worlds are being ticked right now.
+     *
+     * @return true if the worlds are being ticked, false otherwise.
+     */
+    public static boolean isTickingWorlds(){
+        return server.isTickingWorlds();
+    }
+    // Paper end
+
+     /**
+      * Creates or loads a world with the given name using the specified
+      * options.
+      * <p>
+      * If the world is already loaded, it will just return the equivalent of
+      * getWorld(creator.name()).
+     * <p>
+     * Do note that un/loading worlds mid-tick may have potential side effects, we strongly recommend
+     * ensuring that you're not un/loading worlds midtick by checking {@link Bukkit#isTickingWorlds()}
+      *
+      * @param creator the options to use when creating the world
+      * @return newly created or loaded world
+@@ -791,6 +805,9 @@ public final class Bukkit {
+ 
+     /**
+      * Unloads a world with the given name.
+     * <p>
+     * Do note that un/loading worlds mid-tick may have potential side effects, we strongly recommend
+     * ensuring that you're not un/loading worlds midtick by checking {@link Bukkit#isTickingWorlds()}
+      *
+      * @param name Name of the world to unload
+      * @param save whether to save the chunks before unloading
+@@ -802,6 +819,9 @@ public final class Bukkit {
+ 
+     /**
+      * Unloads the given world.
+     * <p>
+     * Do note that un/loading worlds mid-tick may have potential side effects, we strongly recommend
+     * ensuring that you're not un/loading worlds midtick by checking {@link Bukkit#isTickingWorlds()}
+      *
+      * @param world the world to unload
+      * @param save whether to save the chunks before unloading
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 18f4ae463f0e1406842c451b91f333a1bfabae69..5b225bbb128893d67251a96ab318035802a0cf76 100644
+--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
+@@ -647,34 +647,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     @NotNull
+     public List<World> getWorlds();
+ 
+    // Paper start
+    /**
+     * Gets whether the worlds are being ticked right now.
+     *
+     * @return true if the worlds are being ticked, false otherwise.
+     */
+    public boolean isTickingWorlds();
+    // Paper end
+
+     /**
+      * Creates or loads a world with the given name using the specified
+      * options.
+      * <p>
+      * If the world is already loaded, it will just return the equivalent of
+      * getWorld(creator.name()).
+     * <p>
+     * Do note that un/loading worlds mid-tick may have potential side effects, we strongly recommend
+     * ensuring that you're not un/loading worlds midtick by checking {@link Bukkit#isTickingWorlds()}
+      *
+      * @param creator the options to use when creating the world
+      * @return newly created or loaded world
+     * @throws IllegalStateException when {@link #isTickingWorlds() isTickingWorlds} is true
+      */
+     @Nullable
+     public World createWorld(@NotNull WorldCreator creator);
+ 
+     /**
+      * Unloads a world with the given name.
+     * <p>
+     * Do note that un/loading worlds mid-tick may have potential side effects, we strongly recommend
+     * ensuring that you're not un/loading worlds midtick by checking {@link Bukkit#isTickingWorlds()}
+      *
+      * @param name Name of the world to unload
+      * @param save whether to save the chunks before unloading
+      * @return true if successful, false otherwise
+     * @throws IllegalStateException when {@link #isTickingWorlds() isTickingWorlds} is true
+      */
+     public boolean unloadWorld(@NotNull String name, boolean save);
+ 
+     /**
+      * Unloads the given world.
+     * <p>
+     * Do note that un/loading worlds mid-tick may have potential side effects, we strongly recommend
+     * ensuring that you're not un/loading worlds midtick by checking {@link Bukkit#isTickingWorlds()}
+      *
+      * @param world the world to unload
+      * @param save whether to save the chunks before unloading
+      * @return true if successful, false otherwise
+     * @throws IllegalStateException when {@link #isTickingWorlds() isTickingWorlds} is true
+      */
+     public boolean unloadWorld(@NotNull World world, boolean save);
+