From 45e19ffb00d11bf1d5e21a933838631c9b432f29 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 May 2021 18:32:29 -0400 Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit) 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 CraftBukkit Changes: cc21bae97 SPIGOT-5569: Call WorldInitEvent before any chunks are getting generated --- .../0002-Paper-config-files.patch | 10 +++++----- Spigot-Server-Patches/0009-Timings-v2.patch | 6 +++--- Spigot-Server-Patches/0010-Adventure.patch | 18 +++++++++--------- ...lient-crashes-server-lists-and-Mojang.patch | 8 ++++---- ...0024-Further-improve-server-tick-loop.patch | 6 +++--- ...045-Ensure-commands-are-not-ran-async.patch | 4 ++-- .../0047-Expose-server-CommandMap.patch | 4 ++-- .../0053-Add-velocity-warnings.patch | 4 ++-- ...oading-permissions.yml-before-plugins.patch | 6 +++--- ...Allow-Reloading-of-Custom-Permissions.patch | 4 ++-- .../0063-Remove-Metadata-on-reload.patch | 4 ++-- .../0087-Configurable-Player-Collision.patch | 6 +++--- ...-setting-for-proxy-online-mode-status.patch | 4 ++-- ...20-Allow-Reloading-of-Command-Aliases.patch | 4 ++-- ...on-option-to-prevent-player-names-fro.patch | 4 ++-- ...soleAppender-for-console-improvements.patch | 10 +++++----- .../0151-Add-UnknownCommandEvent.patch | 4 ++-- .../0152-Basic-PlayerProfile-API.patch | 6 +++--- .../0179-AsyncTabCompleteEvent.patch | 4 ++-- .../0201-getPlayerUniqueId-API.patch | 4 ++-- ...Add-Early-Warning-Feature-to-WatchDog.patch | 8 ++++---- ...98-Add-Velocity-IP-Forwarding-Support.patch | 4 ++-- ...fault-permission-message-configurable.patch | 4 ++-- ...-isPrimaryThread-and-MinecraftServer-.patch | 6 +++--- ...0380-Expose-the-internal-current-tick.patch | 4 ++-- ...0-Add-tick-times-API-and-mspt-command.patch | 6 +++--- ...0431-Expose-MinecraftServer-isRunning.patch | 4 ++-- .../0436-Improved-Watchdog-Support.patch | 10 +++++----- .../0461-Expose-game-version.patch | 4 ++-- .../0464-Implement-Mob-Goal-API.patch | 6 +++--- ...-Wait-for-Async-Tasks-during-shutdown.patch | 6 +++--- ...d-Plugin-Tickets-to-API-Chunk-Methods.patch | 6 +++--- ...Allow-delegation-to-vanilla-chunk-gen.patch | 4 ++-- .../0549-Add-setMaxPlayers-API.patch | 4 ++-- ...9-Add-getOfflinePlayerIfCached-String.patch | 4 ++-- .../0654-Added-Vanilla-Entity-Tags.patch | 4 ++-- .../0672-misc-debugging-dumps.patch | 6 +++--- .../0689-Implement-Keyed-on-World.patch | 6 +++--- .../0731-Add-basic-Datapack-API.patch | 8 ++++---- work/CraftBukkit | 2 +- 40 files changed, 113 insertions(+), 113 deletions(-) diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 59d761b3b..674e55cfd 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -689,10 +689,10 @@ index 344b7f52e85af3e543da0bb1dd14b68eb41ebb84..f794113e7cc5809d1da0c85648fb7311 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b28ce2590d044dede6b9166e168c00d4ed6578f2..7b77bbf15e59c5a993fb1683c27e41425419e138 100644 +index f03d83440291a329f5a1922c8710ed975025fdbb..82f5b3387f9e71ae258111b7196986623452dc02 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -808,6 +808,7 @@ public final class CraftServer implements Server { +@@ -807,6 +807,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot @@ -700,7 +700,7 @@ index b28ce2590d044dede6b9166e168c00d4ed6578f2..7b77bbf15e59c5a993fb1683c27e4142 for (WorldServer world : console.getWorlds()) { world.worldDataServer.setDifficulty(config.difficulty); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); -@@ -841,6 +842,7 @@ public final class CraftServer implements Server { +@@ -840,6 +841,7 @@ public final class CraftServer implements Server { world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns(); } world.spigotConfig.init(); // Spigot @@ -708,7 +708,7 @@ index b28ce2590d044dede6b9166e168c00d4ed6578f2..7b77bbf15e59c5a993fb1683c27e4142 } pluginManager.clearPlugins(); -@@ -848,6 +850,7 @@ public final class CraftServer implements Server { +@@ -847,6 +849,7 @@ public final class CraftServer implements Server { resetRecipes(); reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot @@ -716,7 +716,7 @@ index b28ce2590d044dede6b9166e168c00d4ed6578f2..7b77bbf15e59c5a993fb1683c27e4142 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2105,4 +2108,35 @@ public final class CraftServer implements Server { +@@ -2102,4 +2105,35 @@ public final class CraftServer implements Server { return spigot; } // Spigot end diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index 40a97bbc1..a068fe666 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -788,7 +788,7 @@ index 21f5474a1cd60168ca059da542a432d40d88b514..07ca1234ad6ffa797003f7317fb88abf int k = 0; CustomFunction.c[] acustomfunction_c = customfunction.b(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index cd3e7b8a23e40c717829bd262bfa675e4e3532f9..511d6094403d17522212fcdda6903a13517c44fa 100644 +index 5ce0dfade68257b51ad4a19a829e1fc0a0bbc3db..85c96e3f70a3ffecb6195a1d83053412eb180d78 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -174,7 +174,7 @@ import org.bukkit.craftbukkit.Main; @@ -1812,10 +1812,10 @@ index 27703b807735d52313b93f8f606aa263571525d2..f301c7ba4b17b92c6cf2fcee6da1e670 private static NBTTagCompound a(ChunkCoordIntPair chunkcoordintpair, Map, StructureStart> map, Map, LongSet> map1) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7b77bbf15e59c5a993fb1683c27e41425419e138..ce68a6cf845af640e03819c44860590655f74cb1 100644 +index 82f5b3387f9e71ae258111b7196986623452dc02..0c1e12b0b43f949d4ace600b2ccdffe52faab1e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2077,12 +2077,31 @@ public final class CraftServer implements Server { +@@ -2074,12 +2074,31 @@ public final class CraftServer implements Server { private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot() { diff --git a/Spigot-Server-Patches/0010-Adventure.patch b/Spigot-Server-Patches/0010-Adventure.patch index 1067478fa..06cdf6b82 100644 --- a/Spigot-Server-Patches/0010-Adventure.patch +++ b/Spigot-Server-Patches/0010-Adventure.patch @@ -1658,10 +1658,10 @@ index 7ec93ddd7e7c9dc54e3e4dcfe0d1654c0b0a8536..3f057f0bd23bc1c693c8f04ee8acd662 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041fac91ce5 100644 +index 0c1e12b0b43f949d4ace600b2ccdffe52faab1e6..2c2e87d96f61e7ef88847df70e1c6153bca9fcd3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -563,8 +563,11 @@ public final class CraftServer implements Server { +@@ -562,8 +562,11 @@ public final class CraftServer implements Server { } @Override @@ -1674,7 +1674,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041 } public Player getPlayer(final EntityPlayer entity) { -@@ -1310,7 +1313,15 @@ public final class CraftServer implements Server { +@@ -1307,7 +1310,15 @@ public final class CraftServer implements Server { return configuration.getInt("settings.spawn-radius", -1); } @@ -1690,7 +1690,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041 public String getShutdownMessage() { return configuration.getString("settings.shutdown-message"); } -@@ -1426,7 +1437,15 @@ public final class CraftServer implements Server { +@@ -1423,7 +1434,15 @@ public final class CraftServer implements Server { } @Override @@ -1706,7 +1706,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041 Set recipients = new HashSet<>(); for (Permissible permissible : getPluginManager().getPermissionSubscriptions(permission)) { if (permissible instanceof CommandSender && permissible.hasPermission(permission)) { -@@ -1434,14 +1453,14 @@ public final class CraftServer implements Server { +@@ -1431,14 +1450,14 @@ public final class CraftServer implements Server { } } @@ -1723,7 +1723,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041 for (CommandSender recipient : recipients) { recipient.sendMessage(message); -@@ -1667,6 +1686,14 @@ public final class CraftServer implements Server { +@@ -1664,6 +1683,14 @@ public final class CraftServer implements Server { return CraftInventoryCreator.INSTANCE.createInventory(owner, type); } @@ -1738,7 +1738,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041 @Override public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) { Validate.isTrue(type.isCreatable(), "Cannot open an inventory of type ", type); -@@ -1679,13 +1706,28 @@ public final class CraftServer implements Server { +@@ -1676,13 +1703,28 @@ public final class CraftServer implements Server { return CraftInventoryCreator.INSTANCE.createInventory(owner, size); } @@ -1767,7 +1767,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041 public Merchant createMerchant(String title) { return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title); } -@@ -1729,6 +1771,12 @@ public final class CraftServer implements Server { +@@ -1726,6 +1768,12 @@ public final class CraftServer implements Server { return Thread.currentThread().equals(console.serverThread) || console.hasStopped() || !org.spigotmc.AsyncCatcher.enabled; // All bets are off if we have shut down (e.g. due to watchdog) } @@ -1780,7 +1780,7 @@ index ce68a6cf845af640e03819c44860590655f74cb1..cb470baa3533e4502c13982ef4e03041 @Override public String getMotd() { return console.getMotd(); -@@ -2157,5 +2205,15 @@ public final class CraftServer implements Server { +@@ -2154,5 +2202,15 @@ public final class CraftServer implements Server { return null; } } diff --git a/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index c038efb7b..d217c0a5b 100644 --- a/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -19,7 +19,7 @@ index a5171d28b960b12c2743ea68a36d747bc967697d..a0f53c9eff04a40780b3ba568dbfc5bb throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 511d6094403d17522212fcdda6903a13517c44fa..9ba05ab7ec97896349f4b754f2993cda9ab1bbfd 100644 +index 85c96e3f70a3ffecb6195a1d83053412eb180d78..c21790b4de698aa6f7fc4dadab64d791cd0562b6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1342,7 +1342,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant playerView; public int reloadCount; diff --git a/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch index c908679a7..61421fdb4 100644 --- a/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch @@ -30,10 +30,10 @@ index 429b74474ced04d8dd8f038b8590b8dfe178bf4d..716f285e67019b8a62922d09c15883c9 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2833861b337cdb28ae12d21c6abee84dbcac314a..6df1ef2640cc6c014051bdb4d71d7cd80e978aec 100644 +index c952b193618c58335172117dfe475047a1178ac5..ac10067e924cfbfe0a528cad62293686c0c24562 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -399,6 +399,7 @@ public final class CraftServer implements Server { +@@ -398,6 +398,7 @@ public final class CraftServer implements Server { if (type == PluginLoadOrder.STARTUP) { helpMap.clear(); helpMap.initializeGeneralTopics(); @@ -41,7 +41,7 @@ index 2833861b337cdb28ae12d21c6abee84dbcac314a..6df1ef2640cc6c014051bdb4d71d7cd8 } Plugin[] plugins = pluginManager.getPlugins(); -@@ -418,7 +419,7 @@ public final class CraftServer implements Server { +@@ -417,7 +418,7 @@ public final class CraftServer implements Server { commandMap.registerServerAliases(); DefaultPermissions.registerCorePermissions(); CraftDefaultPermissions.registerCorePermissions(); diff --git a/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch index 1789e141f..6d4d88aa2 100644 --- a/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b75c5571c3f1d7c45ca2dd29ff285cb5a0d27071..9e2b3ef9296cd6bbba99f1b1e3181fff4e537760 100644 +index ac10067e924cfbfe0a528cad62293686c0c24562..3f300a4fd661707e386090e5ba3be3ddb9af2d00 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2252,5 +2252,23 @@ public final class CraftServer implements Server { +@@ -2249,5 +2249,23 @@ public final class CraftServer implements Server { } return this.adventure$audiences; } diff --git a/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch index fcfe939c2..f63e3e0e6 100644 --- a/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch @@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e5f6dfa4061b98ccb5f3b0cd93ef416a2c20ee78..83ab502d80bbb97204a6f0e4474d1a3b96218448 100644 +index 3f300a4fd661707e386090e5ba3be3ddb9af2d00..16a2c614d58f3604613138210a7ac1be0b00a15c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -873,8 +873,18 @@ public final class CraftServer implements Server { +@@ -872,8 +872,18 @@ public final class CraftServer implements Server { world.paperConfig.init(); // Paper } diff --git a/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch index 450c44ab6..ceaba1942 100644 --- a/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch @@ -32,7 +32,7 @@ index bc40f2cbe1645fd60c4cee106b90f17cd043d32d..c1bb5c325286119891e8d68ce8f7328c packetdataserializer.a(this.c); packetdataserializer.a(this.d); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 33139f9dc6a9c6030f565b01c9b6fd411cafa710..026ddfba26439a00685f3962084aa6194086c9b7 100644 +index b141c744b8ffbc37b09cb4347c4051a77bb7049e..8df60cedc1198916dfce8fcea7ca4a49f98429ba 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -151,6 +151,7 @@ import net.minecraft.world.phys.Vec2F; @@ -43,7 +43,7 @@ index 33139f9dc6a9c6030f565b01c9b6fd411cafa710..026ddfba26439a00685f3962084aa619 import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -552,6 +553,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { CompletableFuture completablefuture; diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java -index cfe784560ea4c368d6e3a0797d09c0a717eb146e..795c4a9e3e33660af888ff80204bfd47a3b327fd 100644 +index bc629c8355a0a2273bcf1285a22deb1ce1154bf9..524bbf9bdf5fb0e1e4ff217ae3291fdbe742437e 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java @@ -177,7 +177,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -345,10 +345,10 @@ index cc41dcd85760b57bb8076b37e9a907d1cb4e12c7..efcfc8f0f45901d14ac8fdf8ed7b0bd6 String msg = "Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ(); System.err.println(msg); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fbc5d62d1ac2affc5240b114ee88375ff0199ef4..b55b2a27adba357faee0f260c8d7cc247d8d8238 100644 +index 9325b4f4f668ecd519d9c0106300d2b4c84bea63..d1eb8818e5d7bb43ef014392a9dd5bc83a34d71a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1841,7 +1841,7 @@ public final class CraftServer implements Server { +@@ -1838,7 +1838,7 @@ public final class CraftServer implements Server { @Override public boolean isPrimaryThread() { @@ -358,7 +358,7 @@ index fbc5d62d1ac2affc5240b114ee88375ff0199ef4..b55b2a27adba357faee0f260c8d7cc24 // Paper start diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index c3e2d9c4d0ef3de80f5206c6bd234121ee1316cc..777116a0a0be6a5a00b1443204d6c53803af8051 100644 +index a399c676c431c16468a55beb09a47ce0d5548769..f9edae56abff5f6b2e2f02dd52fd92feeda9f407 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -12,6 +12,8 @@ import java.util.logging.Level; diff --git a/Spigot-Server-Patches/0461-Expose-game-version.patch b/Spigot-Server-Patches/0461-Expose-game-version.patch index adc8f3c54..528616b73 100644 --- a/Spigot-Server-Patches/0461-Expose-game-version.patch +++ b/Spigot-Server-Patches/0461-Expose-game-version.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b55b2a27adba357faee0f260c8d7cc247d8d8238..688bf56b331cc4b6b9664365f97a98720ec522a9 100644 +index d1eb8818e5d7bb43ef014392a9dd5bc83a34d71a..0196d729406133fe54af88c2c86404bed5905fd4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -518,6 +518,13 @@ public final class CraftServer implements Server { +@@ -517,6 +517,13 @@ public final class CraftServer implements Server { return bukkitVersion; } diff --git a/Spigot-Server-Patches/0464-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0464-Implement-Mob-Goal-API.patch index a31429141..393c0a011 100644 --- a/Spigot-Server-Patches/0464-Implement-Mob-Goal-API.patch +++ b/Spigot-Server-Patches/0464-Implement-Mob-Goal-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/pom.xml b/pom.xml -index dd5f7dba3610b63aa16088a94bf3b459d496cb3c..1869a7fdb8e48dc94cd9c22c7d85298a06729b5b 100644 +index 4c8a057e790c96b0ab5123549d0566371acacb46..1a9204c869dd36e80932b1366352db15ebd70723 100644 --- a/pom.xml +++ b/pom.xml @@ -176,6 +176,13 @@ @@ -1043,10 +1043,10 @@ index 8c8e39d35fb56aa6cf7d456adab01dff5d13a60d..bcf6c924894f49f1c602b83b501f904e public PathfinderGoalWrapped(int i, PathfinderGoal pathfindergoal) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 688bf56b331cc4b6b9664365f97a98720ec522a9..3b7a7791a221aaf39b4b6974b2f37efd403e4b25 100644 +index 0196d729406133fe54af88c2c86404bed5905fd4..418a383eeabccf3d17fc5b05494918957c4f6ca3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2392,5 +2392,11 @@ public final class CraftServer implements Server { +@@ -2389,5 +2389,11 @@ public final class CraftServer implements Server { public boolean isStopping() { return net.minecraft.server.MinecraftServer.getServer().hasStopped(); } diff --git a/Spigot-Server-Patches/0474-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0474-Wait-for-Async-Tasks-during-shutdown.patch index 0e7e30a5f..a1777fbee 100644 --- a/Spigot-Server-Patches/0474-Wait-for-Async-Tasks-during-shutdown.patch +++ b/Spigot-Server-Patches/0474-Wait-for-Async-Tasks-during-shutdown.patch @@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns if any are still running after that delay just as reload does. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e25539dd54956225e8b14d3b8c636130267f226d..9074646e8111c69c4875b0633a424b250a30bc5c 100644 +index 1e7b3a14210edf453de9c1d9ebbb22be5d9f7a7a..1df2ff45edb4c71bf68ae37fe1cb0e5438e0373d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -893,6 +893,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant) new CraftFluidTag(console.getTagRegistry().getFluidTags(), key); diff --git a/Spigot-Server-Patches/0672-misc-debugging-dumps.patch b/Spigot-Server-Patches/0672-misc-debugging-dumps.patch index 5a0eca09e..fa0685849 100644 --- a/Spigot-Server-Patches/0672-misc-debugging-dumps.patch +++ b/Spigot-Server-Patches/0672-misc-debugging-dumps.patch @@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 952d5c7c3324377e0036b9d7e524484cb581e5b2..a116156236caa22d3ee13b5a56f4ed3c8d013f37 100644 +index d043b758a68a6afcc36880f255723413fab57c2a..c9a8b7bfc9cd33185d5abedb50ea1bef0bbde8f9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -14,6 +14,7 @@ import io.netty.buffer.ByteBufOutputStream; @@ -66,7 +66,7 @@ index 952d5c7c3324377e0036b9d7e524484cb581e5b2..a116156236caa22d3ee13b5a56f4ed3c try { this.serverThread.join(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 19bd420e6bf625f77bb37755ff8364e5955feb2a..e8305df0ce11bf7c297bf5f0acc95f07324e4143 100644 +index 75b3698e27327f0c03bbe3e0a9629239ff92e02e..15398675035d2955f84fb22b41d4db9e52fb0d4d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -18,6 +18,7 @@ import com.mojang.serialization.Lifecycle; @@ -77,7 +77,7 @@ index 19bd420e6bf625f77bb37755ff8364e5955feb2a..e8305df0ce11bf7c297bf5f0acc95f07 import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import java.awt.image.BufferedImage; import java.io.File; -@@ -941,6 +942,7 @@ public final class CraftServer implements Server { +@@ -940,6 +941,7 @@ public final class CraftServer implements Server { plugin.getDescription().getName(), "This plugin is not properly shutting down its async tasks when it is being reloaded. This may cause conflicts with the newly loaded version of the plugin" )); diff --git a/Spigot-Server-Patches/0689-Implement-Keyed-on-World.patch b/Spigot-Server-Patches/0689-Implement-Keyed-on-World.patch index 019f32e1d..226659462 100644 --- a/Spigot-Server-Patches/0689-Implement-Keyed-on-World.patch +++ b/Spigot-Server-Patches/0689-Implement-Keyed-on-World.patch @@ -64,10 +64,10 @@ index 760579921927b4c8b0f20b2611b95fd626e4b27f..3075700dfa992da81b10246fcf7c7ad1 return this.c; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e8305df0ce11bf7c297bf5f0acc95f07324e4143..6cc8eb04f42592aa12f76bb4a0a863ea509741b2 100644 +index 15398675035d2955f84fb22b41d4db9e52fb0d4d..9e7b6043e6ead590689ed0d7341cd8b16d7f3c39 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1161,7 +1161,7 @@ public final class CraftServer implements Server { +@@ -1160,7 +1160,7 @@ public final class CraftServer implements Server { } else if (name.equals(levelName + "_the_end")) { worldKey = net.minecraft.world.level.World.THE_END; } else { @@ -76,7 +76,7 @@ index e8305df0ce11bf7c297bf5f0acc95f07324e4143..6cc8eb04f42592aa12f76bb4a0a863ea } WorldServer internal = (WorldServer) new WorldServer(console, console.executorService, worldSession, worlddata, worldKey, dimensionmanager, getServer().worldLoadListenerFactory.create(11), -@@ -1253,6 +1253,15 @@ public final class CraftServer implements Server { +@@ -1250,6 +1250,15 @@ public final class CraftServer implements Server { return null; } diff --git a/Spigot-Server-Patches/0731-Add-basic-Datapack-API.patch b/Spigot-Server-Patches/0731-Add-basic-Datapack-API.patch index d0eae2727..2ee4dc6d4 100644 --- a/Spigot-Server-Patches/0731-Add-basic-Datapack-API.patch +++ b/Spigot-Server-Patches/0731-Add-basic-Datapack-API.patch @@ -134,7 +134,7 @@ index e87523612d0423d71eab7b9af851c1c268cdf84f..568da9686c41a41e43ede3fe15e0ca53 return this.c; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..edeb3e542c2e32379a5fb4229b389ad4a4987dbb 100644 +index 9e7b6043e6ead590689ed0d7341cd8b16d7f3c39..3ef4197bcc2a98a983055856c099d41eea595d84 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -18,6 +18,7 @@ import com.mojang.serialization.Lifecycle; @@ -145,7 +145,7 @@ index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..edeb3e542c2e32379a5fb4229b389ad4 import io.papermc.paper.util.TraceUtil; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import java.awt.image.BufferedImage; -@@ -268,6 +269,7 @@ public final class CraftServer implements Server { +@@ -267,6 +268,7 @@ public final class CraftServer implements Server { public boolean ignoreVanillaPermissions = false; private final List playerView; public int reloadCount; @@ -153,7 +153,7 @@ index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..edeb3e542c2e32379a5fb4229b389ad4 public static Exception excessiveVelEx; // Paper - Velocity warnings static { -@@ -350,6 +352,7 @@ public final class CraftServer implements Server { +@@ -349,6 +351,7 @@ public final class CraftServer implements Server { TicketType.PLUGIN.loadPeriod = Math.min(20, configuration.getInt("chunk-gc.period-in-ticks")); // Paper - cap plugin loads to 1 second minimumAPI = configuration.getString("settings.minimum-api"); loadIcon(); @@ -161,7 +161,7 @@ index 6cc8eb04f42592aa12f76bb4a0a863ea509741b2..edeb3e542c2e32379a5fb4229b389ad4 } public boolean getCommandBlockOverride(String command) { -@@ -2498,5 +2501,11 @@ public final class CraftServer implements Server { +@@ -2495,5 +2498,11 @@ public final class CraftServer implements Server { public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() { return mobGoals; } diff --git a/work/CraftBukkit b/work/CraftBukkit index 1e8c432cd..cc21bae97 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 1e8c432cd90ffdd0300c7f73487649bae4c0aac8 +Subproject commit cc21bae97758b850c5e36b6a97cd0850a28c28da