Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
This commit is contained in:
Nassim Jahnke
GitHub
parent
4356758b64
commit
c0936a71bd
1054 changed files with 1424 additions and 1845 deletions
|
|
@ -1,117 +0,0 @@
|
|||
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);
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue