From 262c08f64fd4cd055a6e0f1f9b866624f3a36b59 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Thu, 15 Dec 2022 17:16:34 -0800 Subject: [PATCH] Updated Upstream (CraftBukkit) (#8680) 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: 2ed3e3e6e SPIGOT-7210: Fix structures in custom worlds 585ab5ba1 SPIGOT-7207: WorldCreator creates world as super flat even when normal is specified --- patches/server/0007-CB-fixes.patch | 4 ++-- patches/server/0009-Adventure.patch | 16 ++++++++-------- patches/server/0010-Paper-command.patch | 4 ++-- patches/server/0012-Timings-v2.patch | 10 +++++----- patches/server/0016-Rewrite-chunk-system.patch | 14 +++++++------- .../0029-Further-improve-server-tick-loop.patch | 6 +++--- .../server/0052-Expose-server-CommandMap.patch | 4 ++-- ...6-Allow-Reloading-of-Custom-Permissions.patch | 4 ++-- ...dd-setting-for-proxy-online-mode-status.patch | 4 ++-- ...0112-Allow-Reloading-of-Command-Aliases.patch | 4 ++-- ...tion-option-to-prevent-player-names-fro.patch | 4 ++-- ...onsoleAppender-for-console-improvements.patch | 8 ++++---- .../server/0142-Basic-PlayerProfile-API.patch | 4 ++-- patches/server/0168-AsyncTabCompleteEvent.patch | 6 +++--- patches/server/0184-getPlayerUniqueId-API.patch | 4 ++-- ...default-permission-message-configurable.patch | 4 ++-- .../0318-Expose-the-internal-current-tick.patch | 4 ++-- patches/server/0344-Anti-Xray.patch | 4 ++-- ...364-Add-tick-times-API-and-mspt-command.patch | 6 +++--- .../0365-Expose-MinecraftServer-isRunning.patch | 4 ++-- ...85-Load-Chunks-for-Login-Asynchronously.patch | 10 +++++----- patches/server/0399-Implement-Mob-Goal-API.patch | 4 ++-- ...497-Add-getOfflinePlayerIfCached-String.patch | 4 ++-- patches/server/0585-Expand-world-key-API.patch | 6 +++--- patches/server/0620-Add-basic-Datapack-API.patch | 4 ++-- ...-Fix-and-optimise-world-force-upgrading.patch | 8 ++++---- ...dd-cause-to-Weather-ThunderChangeEvents.patch | 10 +++++----- ...d-paper-mobcaps-and-paper-playermobcaps.patch | 4 ++-- ...2-Allow-delegation-to-vanilla-chunk-gen.patch | 4 ++-- ...se-vanilla-BiomeProvider-from-WorldInfo.patch | 6 +++--- ...ing-command-sender-which-forwards-feedb.patch | 4 ++-- ...alidate-calls-to-CraftServer-getSpawnLi.patch | 4 ++-- patches/server/0802-Add-GameEvent-tags.patch | 6 +++--- ...into-worldlist-before-initing-the-world.patch | 4 ++-- patches/server/0810-Custom-Potion-Mixes.patch | 4 ++-- .../server/0822-Fix-saving-in-unloadWorld.patch | 4 ++-- .../0838-WorldCreator-keepSpawnLoaded.patch | 4 ++-- ...tion-on-world-create-while-being-ticked.patch | 4 ++-- ...-t-broadcast-messages-to-command-blocks.patch | 4 ++-- work/CraftBukkit | 2 +- 40 files changed, 109 insertions(+), 109 deletions(-) diff --git a/patches/server/0007-CB-fixes.patch b/patches/server/0007-CB-fixes.patch index f25e88ce3e..5b1960ee3e 100644 --- a/patches/server/0007-CB-fixes.patch +++ b/patches/server/0007-CB-fixes.patch @@ -83,10 +83,10 @@ index 99af167b02c1291f9f5fd1a195a3eb65de87002b..874f7ea643d27eec47d51a10ad472af7 this.registryAccess = registryManager; this.structureTemplateManager = structureTemplateManager; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7faf3100253b7b1fd7119cf83238d8a349e7a6bb..2d3e0eed3ef5ac3853ede30bd67866d2a6e87508 100644 +index 8873bf84c71c48297a360df9c99e511fa0af5b40..f29395b6bf9eebd4830bbcda7d96085fb8e3d8b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2302,7 +2302,13 @@ public final class CraftServer implements Server { +@@ -2305,7 +2305,13 @@ public final class CraftServer implements Server { Validate.notNull(key, "NamespacedKey cannot be null"); LootTables registry = this.getServer().getLootTables(); diff --git a/patches/server/0009-Adventure.patch b/patches/server/0009-Adventure.patch index 3a4adab444..e30ecdb8ab 100644 --- a/patches/server/0009-Adventure.patch +++ b/patches/server/0009-Adventure.patch @@ -2529,7 +2529,7 @@ index 7ff9abc0d8fae40c425c9b5151cb36a3b8c2eee7..1fd305ccedfd311dc5238810003889b2 } collection = icons; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2d3e0eed3ef5ac3853ede30bd67866d2a6e87508..89feb208c93d76445dc01cf592ed5728c1659908 100644 +index f29395b6bf9eebd4830bbcda7d96085fb8e3d8b0..877a104e3899debd387544b740896ffbe86bb581 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -605,8 +605,10 @@ public final class CraftServer implements Server { @@ -2543,7 +2543,7 @@ index 2d3e0eed3ef5ac3853ede30bd67866d2a6e87508..89feb208c93d76445dc01cf592ed5728 } @Override -@@ -1437,7 +1439,15 @@ public final class CraftServer implements Server { +@@ -1440,7 +1442,15 @@ public final class CraftServer implements Server { return this.configuration.getInt("settings.spawn-radius", -1); } @@ -2559,7 +2559,7 @@ index 2d3e0eed3ef5ac3853ede30bd67866d2a6e87508..89feb208c93d76445dc01cf592ed5728 public String getShutdownMessage() { return this.configuration.getString("settings.shutdown-message"); } -@@ -1605,7 +1615,20 @@ public final class CraftServer implements Server { +@@ -1608,7 +1618,20 @@ public final class CraftServer implements Server { } @Override @@ -2580,7 +2580,7 @@ index 2d3e0eed3ef5ac3853ede30bd67866d2a6e87508..89feb208c93d76445dc01cf592ed5728 Set recipients = new HashSet<>(); for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) { if (permissible instanceof CommandSender && permissible.hasPermission(permission)) { -@@ -1613,14 +1636,14 @@ public final class CraftServer implements Server { +@@ -1616,14 +1639,14 @@ public final class CraftServer implements Server { } } @@ -2597,7 +2597,7 @@ index 2d3e0eed3ef5ac3853ede30bd67866d2a6e87508..89feb208c93d76445dc01cf592ed5728 for (CommandSender recipient : recipients) { recipient.sendMessage(message); -@@ -1871,6 +1894,14 @@ public final class CraftServer implements Server { +@@ -1874,6 +1897,14 @@ public final class CraftServer implements Server { return CraftInventoryCreator.INSTANCE.createInventory(owner, type); } @@ -2612,7 +2612,7 @@ index 2d3e0eed3ef5ac3853ede30bd67866d2a6e87508..89feb208c93d76445dc01cf592ed5728 @Override public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) { Validate.isTrue(type.isCreatable(), "Cannot open an inventory of type ", type); -@@ -1883,13 +1914,28 @@ public final class CraftServer implements Server { +@@ -1886,13 +1917,28 @@ public final class CraftServer implements Server { return CraftInventoryCreator.INSTANCE.createInventory(owner, size); } @@ -2641,7 +2641,7 @@ index 2d3e0eed3ef5ac3853ede30bd67866d2a6e87508..89feb208c93d76445dc01cf592ed5728 public Merchant createMerchant(String title) { return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title); } -@@ -1954,6 +2000,12 @@ public final class CraftServer implements Server { +@@ -1957,6 +2003,12 @@ public final class CraftServer implements Server { return Thread.currentThread().equals(console.serverThread) || this.console.hasStopped() || !org.spigotmc.AsyncCatcher.enabled; // All bets are off if we have shut down (e.g. due to watchdog) } @@ -2654,7 +2654,7 @@ index 2d3e0eed3ef5ac3853ede30bd67866d2a6e87508..89feb208c93d76445dc01cf592ed5728 @Override public String getMotd() { return this.console.getMotd(); -@@ -2381,4 +2433,15 @@ public final class CraftServer implements Server { +@@ -2384,4 +2436,15 @@ public final class CraftServer implements Server { return this.spigot; } // Spigot end diff --git a/patches/server/0010-Paper-command.patch b/patches/server/0010-Paper-command.patch index d73d845974..ed72dedb84 100644 --- a/patches/server/0010-Paper-command.patch +++ b/patches/server/0010-Paper-command.patch @@ -559,7 +559,7 @@ index 1fe07773cf9664164b29164caba22800e5a6bdae..cb6f192c11cda6230ec365e6cefb44a3 this.setPvpAllowed(dedicatedserverproperties.pvp); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 26ae612c1314258f382d1fb28c07285b0f4cd780..f1acded917678d69fe9de2bdcab5f9f747a53d78 100644 +index 877a104e3899debd387544b740896ffbe86bb581..26ca07b5e302cc4cc02e06f5d07f6d9eb541275e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -909,6 +909,7 @@ public final class CraftServer implements Server { @@ -570,7 +570,7 @@ index 26ae612c1314258f382d1fb28c07285b0f4cd780..f1acded917678d69fe9de2bdcab5f9f7 this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2435,6 +2436,34 @@ public final class CraftServer implements Server { +@@ -2438,6 +2439,34 @@ public final class CraftServer implements Server { // Spigot end // Paper start diff --git a/patches/server/0012-Timings-v2.patch b/patches/server/0012-Timings-v2.patch index 84939de333..ce02d8b2a3 100644 --- a/patches/server/0012-Timings-v2.patch +++ b/patches/server/0012-Timings-v2.patch @@ -1262,7 +1262,7 @@ index 8784b0702f10eb7582c309c15f18fe13eebd9c8e..6f81aa6b0a835bf10e0d5f2b32fe9fb2 this.entityManager.saveAll(); } else { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 91a0b7923b5a39a7de5d7899002ec4cd4a987a47..b383b5d21f6fd06f0825838aad51047211bc8148 100644 +index f4502ebedb31b101faa6c99c4fa51fb5b4fdf3f0..e4435962a60cf9c6d833183bd244a2758ff42808 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -335,7 +335,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -1369,7 +1369,7 @@ index 742897a534dac2bbbacaca0f6c8196e8d2bc03dd..23b22543c3d164e3fdf2f262f3e01246 protected boolean isHorizontalCollisionMinor(Vec3 adjustedMovement) { diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index 0c464516b7168ebee69c46e89677cae5e19ef659..2e392630d3b4b08ff8ab82b7f8b32b7fbf21570d 100644 +index 092d563dd1fa8577818aaaa8e81db92c67a77587..e0620a295d49e42bcc8ee397c6d53143eab15103 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -315,6 +315,15 @@ public class EntityType implements FeatureElement, EntityTypeT @@ -1611,10 +1611,10 @@ index cf496b430bf3d7aab0b8e86c11e015583c1411a7..6fdd5c92ab069896e3921faa042cbdb3 }; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 01bee6cf472ee4f434208eb40f6e25c31c652cb6..f3fc33d0592b5eb62cdd86dae03d55f796a15d4d 100644 +index 26ca07b5e302cc4cc02e06f5d07f6d9eb541275e..c684460c91ad41ba9741616c25dae5c3efede704 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2403,12 +2403,31 @@ public final class CraftServer implements Server { +@@ -2406,12 +2406,31 @@ public final class CraftServer implements Server { private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot() { @@ -1816,7 +1816,7 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cfc2636b939f7590e2f31c551dc397dfe2e98188..70d02af76c65379f0dd9d2800d7327d68e93f3d1 100644 +index 6c316c969e87d9da047cd80c15d5579f7f65d1a5..2da35b1caef3958c7a385012d85e65f292c88227 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2378,6 +2378,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0016-Rewrite-chunk-system.patch b/patches/server/0016-Rewrite-chunk-system.patch index 5e2030fd75..c7bb49c89e 100644 --- a/patches/server/0016-Rewrite-chunk-system.patch +++ b/patches/server/0016-Rewrite-chunk-system.patch @@ -13532,7 +13532,7 @@ index a7feddc31da0870faa3d32a7108282e9e9143180..2ba3bb4e5670ece798a8882801a856d8 // Paper end } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index c4be39d98267e78c32abe63e3b13806fd23c54dc..38b6885d6ed9c0c799a69e8b6b069dc82d67bab6 100644 +index a07c413f1ee1a1689ca8ca87137cf4992d85c7aa..3c5b6231dc6f3dcc275e032d03989ed638fb03a9 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -125,10 +125,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -15922,7 +15922,7 @@ index e96a0ca47e4701ba187555bd92c968345bc85677..73b96f804079288e9c5fcc11da54e61e + // Paper end } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 45c12d663330f166000db326c8a145b6af9e2c46..06d221dcc4091032016c85143cf3432a988780c0 100644 +index e4435962a60cf9c6d833183bd244a2758ff42808..b85545f997447875e737e4d22a8a8dbcf1f8e2c8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -776,6 +776,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -17854,10 +17854,10 @@ index d58f6b48befbc637a58e669c83e994bae8872adf..cda6277a3a8eefc80de00ffc98687ce0 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f3fc33d0592b5eb62cdd86dae03d55f796a15d4d..6c0ebfeb77ad572b3c89327757348333969fa6d6 100644 +index c684460c91ad41ba9741616c25dae5c3efede704..720a078acfe770dba76413a8cfa4ef15616ae292 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1139,7 +1139,7 @@ public final class CraftServer implements Server { +@@ -1142,7 +1142,7 @@ public final class CraftServer implements Server { this.console.addLevel(internal); this.getServer().prepareLevels(internal.getChunkSource().chunkMap.progressListener, internal); @@ -17866,7 +17866,7 @@ index f3fc33d0592b5eb62cdd86dae03d55f796a15d4d..6c0ebfeb77ad572b3c89327757348333 this.pluginManager.callEvent(new WorldLoadEvent(internal.getWorld())); return internal.getWorld(); -@@ -1183,7 +1183,7 @@ public final class CraftServer implements Server { +@@ -1186,7 +1186,7 @@ public final class CraftServer implements Server { } handle.getChunkSource().close(save); @@ -17875,7 +17875,7 @@ index f3fc33d0592b5eb62cdd86dae03d55f796a15d4d..6c0ebfeb77ad572b3c89327757348333 handle.convertable.close(); } catch (Exception ex) { this.getLogger().log(Level.SEVERE, null, ex); -@@ -1998,7 +1998,7 @@ public final class CraftServer implements Server { +@@ -2001,7 +2001,7 @@ public final class CraftServer implements Server { @Override public boolean isPrimaryThread() { @@ -18004,7 +18004,7 @@ index e91305263fcf6929fe62e5e8da46721707b51517..3ad15c0909d14c6f974e9bf82055c3c3 // Spigot start private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 091346c2cbe7f7cf0173072343f796afe2a0f4c5..ae51e7bbbded0f317fc344a6f0fe9cb1451f5649 100644 +index 2da35b1caef3958c7a385012d85e65f292c88227..22de7446f4ea6faa79d5006b2a422cfd84f1e22e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -176,6 +176,81 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0029-Further-improve-server-tick-loop.patch b/patches/server/0029-Further-improve-server-tick-loop.patch index ddcde507f6..9f1bc03008 100644 --- a/patches/server/0029-Further-improve-server-tick-loop.patch +++ b/patches/server/0029-Further-improve-server-tick-loop.patch @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7e313778c44c2b06543c95b5687c2dd841b5216a..4aad7d7de77f82db9d442fbe709cdd52dced895e 100644 +index e2e66fd4bd34e0ceaab350214a50ddbb1dc76184..ac81428f19e2d445f315000d34173c2d650a9aeb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -281,7 +281,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0e4691ab7ad4459282398e4c2160df4e442fdcb4..d30876c2a7f3871fb4c035d9cbe920f18ac7b05e 100644 +index fb2918f3f99bae7b549412712adeeb55a45c9e9b..c8193e4fc77612f4535f360777dbe93f75b5be4e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -776,12 +776,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -91,10 +91,10 @@ index 0e4691ab7ad4459282398e4c2160df4e442fdcb4..d30876c2a7f3871fb4c035d9cbe920f1 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2e00f77ce6bbc84551cd74acfc77c113991e83a0..e424a7027e6e4ee981abeb8880e30b8b83a75e99 100644 +index bc8a2d9a4388887c8e49dd9e5ceebd0ca3b0e893..06a962ac9644df033b95f3bed3ee96a8fc00edb0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2110,7 +2110,7 @@ public final class CraftServer implements Server { +@@ -2113,7 +2113,7 @@ public final class CraftServer implements Server { offers = this.tabCompleteChat(player, message); } diff --git a/patches/server/0184-getPlayerUniqueId-API.patch b/patches/server/0184-getPlayerUniqueId-API.patch index 2a91e608d7..8cf38938d2 100644 --- a/patches/server/0184-getPlayerUniqueId-API.patch +++ b/patches/server/0184-getPlayerUniqueId-API.patch @@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e424a7027e6e4ee981abeb8880e30b8b83a75e99..1c8a103d70ddb7d178057d48abddf75c69f789b7 100644 +index 06a962ac9644df033b95f3bed3ee96a8fc00edb0..02b2452fa5bdcd667f8c0be97f425310975c9312 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1732,6 +1732,25 @@ public final class CraftServer implements Server { +@@ -1735,6 +1735,25 @@ public final class CraftServer implements Server { return recipients.size(); } diff --git a/patches/server/0284-Make-the-default-permission-message-configurable.patch b/patches/server/0284-Make-the-default-permission-message-configurable.patch index 4a593d2bca..d4fa63a50b 100644 --- a/patches/server/0284-Make-the-default-permission-message-configurable.patch +++ b/patches/server/0284-Make-the-default-permission-message-configurable.patch @@ -18,10 +18,10 @@ index 1e9105cf5ab2ff0ee847fafd00b41e1bd47f1d9e..65ee888280f917ccd11146505b738951 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index dc9fce11cb5b76b9e29c0f50c90c96fdf0b830ce..9d778f076512969d8de93256dfde0ebbdb0433ae 100644 +index 3fc2354df83cf4a9d3f18decc996beef90c5d9a1..56783cacf0b2e3042ce8cdb1fd3745b6b19d3226 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2646,6 +2646,16 @@ public final class CraftServer implements Server { +@@ -2649,6 +2649,16 @@ public final class CraftServer implements Server { return io.papermc.paper.configuration.GlobalConfiguration.get().commands.suggestPlayerNamesWhenNullTabCompletions; } diff --git a/patches/server/0318-Expose-the-internal-current-tick.patch b/patches/server/0318-Expose-the-internal-current-tick.patch index 7e8167d781..0a357a7ece 100644 --- a/patches/server/0318-Expose-the-internal-current-tick.patch +++ b/patches/server/0318-Expose-the-internal-current-tick.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9d778f076512969d8de93256dfde0ebbdb0433ae..9b5d3dbf302a44d6ed774c8397117e7a6231b2f9 100644 +index 56783cacf0b2e3042ce8cdb1fd3745b6b19d3226..7bc16e221b37629708299773519da60a1d9930ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2687,5 +2687,10 @@ public final class CraftServer implements Server { +@@ -2690,5 +2690,10 @@ public final class CraftServer implements Server { profile.getProperties().putAll(((CraftPlayer)player).getHandle().getGameProfile().getProperties()); return new com.destroystokyo.paper.profile.CraftPlayerProfile(profile); } diff --git a/patches/server/0344-Anti-Xray.patch b/patches/server/0344-Anti-Xray.patch index af43c4203b..cd81e41f75 100644 --- a/patches/server/0344-Anti-Xray.patch +++ b/patches/server/0344-Anti-Xray.patch @@ -1537,10 +1537,10 @@ index 6772b7e6ebded67f656dfb1af99e4d516aca67c5..1ac0778fba70ba9f09487c76e086b5a8 public CraftChunk(net.minecraft.world.level.chunk.LevelChunk chunk) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6fc57df47db575f4f3d56784ac0bc8b496d1eba1..9b187eba01689ae640117bd638ffe9f16499d051 100644 +index 7bc16e221b37629708299773519da60a1d9930ac..3106711ef8034077cd54e40dc2e8fa003101db26 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2259,7 +2259,7 @@ public final class CraftServer implements Server { +@@ -2262,7 +2262,7 @@ public final class CraftServer implements Server { public ChunkGenerator.ChunkData createChunkData(World world) { Validate.notNull(world, "World cannot be null"); ServerLevel handle = ((CraftWorld) world).getHandle(); diff --git a/patches/server/0364-Add-tick-times-API-and-mspt-command.patch b/patches/server/0364-Add-tick-times-API-and-mspt-command.patch index a186311293..c0024357ca 100644 --- a/patches/server/0364-Add-tick-times-API-and-mspt-command.patch +++ b/patches/server/0364-Add-tick-times-API-and-mspt-command.patch @@ -125,7 +125,7 @@ index 6a00f3d38da8107825ab1d405f337fd077b09f72..d31b5ed47cffc61c90c926a0cd2005b7 public static void registerCommands(final MinecraftServer server) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 867e7186764057507f6f92b52ea6afc4d08774b4..8ea5d3cb180b403f68d95ad6428dcad91b88ba2c 100644 +index 023119624c0534bedb248099d0e12c76622a363a..8dcbeeae50afe23aa7e2a083239f0a315424574f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -249,6 +249,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop WorldDataServer public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ecaf03a72caac6e7866094bae7256f5447a962e4..55705fca6dba1bebe0cb444a68c130f8f2785ae3 100644 +index 78913368d8fa74273126a1245d2faf55242fccdd..d6200e09e0ca6fab8ecbfa5f21c52009b9959b77 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -184,6 +184,7 @@ public class ServerPlayer extends Player { @@ -57,7 +57,7 @@ index 97d1ff2af23bac14e67bca5896843325aaa5bfc1..e9bc61590d33dc341074371859ceec54 public static final TicketType UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1); public static final TicketType PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c6ad5963540b5f51776ba52eefdf7d5be3475906..a4a2e560304def17ab0943a2d876f6e8e521809b 100644 +index b42ef07a2653b62cf6ba44172e5a919be3de964f..6decd63fb773eab4ee06fe4bc0bc2659a1fa5388 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -339,6 +339,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -266,10 +266,10 @@ index cfc497822e4e1dfc21807ec93bcfabb215cdbb95..2c0e45b3d0f5a1178ccecc851a110e5d Iterator iterator = list.iterator(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 026a9decf87965ebe3c45df7e129cf6758364e5a..e28b973efe4f107d0a0d18dd2492f03ce2b424e9 100644 +index 3ba07a7ba5300ac2b087c563355b4795ae33e27e..82e8d9e5a1a635926789b2fb9872bcfc3483217a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1243,7 +1243,7 @@ public final class CraftServer implements Server { +@@ -1246,7 +1246,7 @@ public final class CraftServer implements Server { return false; } diff --git a/patches/server/0399-Implement-Mob-Goal-API.patch b/patches/server/0399-Implement-Mob-Goal-API.patch index b11e147e86..98e3ff619b 100644 --- a/patches/server/0399-Implement-Mob-Goal-API.patch +++ b/patches/server/0399-Implement-Mob-Goal-API.patch @@ -791,10 +791,10 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31 LOOK, JUMP, diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 867c864e6f8f1297c9e14d0c75831d355d7d8843..ab2598ea98373f9e997af4a916f4a8b153256d1f 100644 +index 889833bc7994973e1c5fb408b40ade69b445f8af..1ca964776e150b15270cf314ea6ed642f737641e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2715,5 +2715,11 @@ public final class CraftServer implements Server { +@@ -2718,5 +2718,11 @@ public final class CraftServer implements Server { public boolean isStopping() { return net.minecraft.server.MinecraftServer.getServer().hasStopped(); } diff --git a/patches/server/0497-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0497-Add-getOfflinePlayerIfCached-String.patch index c76bdd25f5..4306ec8a20 100644 --- a/patches/server/0497-Add-getOfflinePlayerIfCached-String.patch +++ b/patches/server/0497-Add-getOfflinePlayerIfCached-String.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d296f5c970dc4c242fc18fb82e6db583eefef8d8..a9c9ec39610a8612ce92db1441be29ab77117ecc 100644 +index 080987796064e7f35a1fd8b1b8190262882b5d4c..24ed5fa253b18705ad0f5d5d676f75233aa55363 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1827,6 +1827,28 @@ public final class CraftServer implements Server { +@@ -1830,6 +1830,28 @@ public final class CraftServer implements Server { return result; } diff --git a/patches/server/0585-Expand-world-key-API.patch b/patches/server/0585-Expand-world-key-API.patch index dbaa779c0c..4f1bac0a63 100644 --- a/patches/server/0585-Expand-world-key-API.patch +++ b/patches/server/0585-Expand-world-key-API.patch @@ -20,7 +20,7 @@ index 3e4ac4020c9f51e634eadd43243d34267bea4b22..ce52ae980309ecddf597e14b759b77ea // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a9c9ec39610a8612ce92db1441be29ab77117ecc..493b054977b4d3f9bd3734c3e9d3ad5002d3f9f1 100644 +index 24ed5fa253b18705ad0f5d5d676f75233aa55363..bcb40a419febfe2b031afe77a4ee5ccb97374240 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1156,9 +1156,15 @@ public final class CraftServer implements Server { @@ -41,7 +41,7 @@ index a9c9ec39610a8612ce92db1441be29ab77117ecc..493b054977b4d3f9bd3734c3e9d3ad50 if ((folder.exists()) && (!folder.isDirectory())) { throw new IllegalArgumentException("File exists with the name '" + name + "' and isn't a folder"); -@@ -1244,7 +1250,7 @@ public final class CraftServer implements Server { +@@ -1247,7 +1253,7 @@ public final class CraftServer implements Server { } else if (name.equals(levelName + "_the_end")) { worldKey = net.minecraft.world.level.Level.END; } else { @@ -50,7 +50,7 @@ index a9c9ec39610a8612ce92db1441be29ab77117ecc..493b054977b4d3f9bd3734c3e9d3ad50 } ServerLevel internal = (ServerLevel) new ServerLevel(this.console, console.executor, worldSession, worlddata, worldKey, worlddimension, this.getServer().progressListenerFactory.create(11), -@@ -1336,6 +1342,15 @@ public final class CraftServer implements Server { +@@ -1339,6 +1345,15 @@ public final class CraftServer implements Server { return null; } diff --git a/patches/server/0620-Add-basic-Datapack-API.patch b/patches/server/0620-Add-basic-Datapack-API.patch index dd8a5e6b37..6323b4aae5 100644 --- a/patches/server/0620-Add-basic-Datapack-API.patch +++ b/patches/server/0620-Add-basic-Datapack-API.patch @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 493b054977b4d3f9bd3734c3e9d3ad5002d3f9f1..8caeea4bb8b57501c3ad0d5cd04fe0001fd270d5 100644 +index bcb40a419febfe2b031afe77a4ee5ccb97374240..7fb8287fcb0a050290ee56205f9e763396530e4b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -295,6 +295,7 @@ public final class CraftServer implements Server { @@ -111,7 +111,7 @@ index 493b054977b4d3f9bd3734c3e9d3ad5002d3f9f1..8caeea4bb8b57501c3ad0d5cd04fe000 } public boolean getCommandBlockOverride(String command) { -@@ -2794,5 +2796,11 @@ public final class CraftServer implements Server { +@@ -2797,5 +2799,11 @@ public final class CraftServer implements Server { public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() { return mobGoals; } diff --git a/patches/server/0626-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0626-Fix-and-optimise-world-force-upgrading.patch index 0ce9173162..a4d4d11d28 100644 --- a/patches/server/0626-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0626-Fix-and-optimise-world-force-upgrading.patch @@ -359,11 +359,11 @@ index b294ef87fb93e7f4651dc04128124f297575860d..65fd57609e45ccd49ebfc1ba80d25243 return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ())); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8caeea4bb8b57501c3ad0d5cd04fe0001fd270d5..613d77a51c249b5a516df7aedc8a08b9f1a14b81 100644 +index 7fb8287fcb0a050290ee56205f9e763396530e4b..a44409160d236604d62c3fdacce6dae8a1c8d646 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1229,12 +1229,7 @@ public final class CraftServer implements Server { - } +@@ -1232,12 +1232,7 @@ public final class CraftServer implements Server { + worlddata.customDimensions = iregistry; worlddata.checkName(name); worlddata.setModdedInfo(this.console.getServerModName(), this.console.getModdedStatus().shouldReportAsModified()); - @@ -376,7 +376,7 @@ index 8caeea4bb8b57501c3ad0d5cd04fe0001fd270d5..613d77a51c249b5a516df7aedc8a08b9 long j = BiomeManager.obfuscateSeed(creator.seed()); List list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata)); -@@ -1245,6 +1240,13 @@ public final class CraftServer implements Server { +@@ -1248,6 +1243,13 @@ public final class CraftServer implements Server { biomeProvider = generator.getDefaultBiomeProvider(worldInfo); } diff --git a/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch index 3ef95cf22a..93f155aab2 100644 --- a/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -48,10 +48,10 @@ index 5e1448c900b8569344f5c7d219c0d7ce92ccd5b4..307c451c7fb8e783440f805bf2623ba7 // If we stop due to everyone sleeping we should reset the weather duration to some other random value. // Not that everyone ever manages to get the whole server to sleep at the same time.... diff --git a/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java b/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java -index 68d495d5554d5c5758537be11188745e1458a00c..6eafa7969f463a6ee33b84b7e6a79f8088aa40a1 100644 +index 274c8eb1f76fb7cb8a16b438e7e1b14804f3dc51..b6218626bad7f8ddfba91b216ac1e10647f04df5 100644 --- a/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java +++ b/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java -@@ -354,6 +354,11 @@ public class PrimaryLevelData implements ServerLevelData, WorldData { +@@ -359,6 +359,11 @@ public class PrimaryLevelData implements ServerLevelData, WorldData { @Override public void setThundering(boolean thundering) { @@ -63,7 +63,7 @@ index 68d495d5554d5c5758537be11188745e1458a00c..6eafa7969f463a6ee33b84b7e6a79f80 // CraftBukkit start if (this.thundering == thundering) { return; -@@ -361,7 +366,7 @@ public class PrimaryLevelData implements ServerLevelData, WorldData { +@@ -366,7 +371,7 @@ public class PrimaryLevelData implements ServerLevelData, WorldData { org.bukkit.World world = Bukkit.getWorld(this.getLevelName()); if (world != null) { @@ -72,7 +72,7 @@ index 68d495d5554d5c5758537be11188745e1458a00c..6eafa7969f463a6ee33b84b7e6a79f80 Bukkit.getServer().getPluginManager().callEvent(thunder); if (thunder.isCancelled()) { return; -@@ -388,6 +393,12 @@ public class PrimaryLevelData implements ServerLevelData, WorldData { +@@ -393,6 +398,12 @@ public class PrimaryLevelData implements ServerLevelData, WorldData { @Override public void setRaining(boolean raining) { @@ -85,7 +85,7 @@ index 68d495d5554d5c5758537be11188745e1458a00c..6eafa7969f463a6ee33b84b7e6a79f80 // CraftBukkit start if (this.raining == raining) { return; -@@ -395,7 +406,7 @@ public class PrimaryLevelData implements ServerLevelData, WorldData { +@@ -400,7 +411,7 @@ public class PrimaryLevelData implements ServerLevelData, WorldData { org.bukkit.World world = Bukkit.getWorld(this.getLevelName()); if (world != null) { diff --git a/patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch index de33d5f917..2563a008fb 100644 --- a/patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -286,10 +286,10 @@ index bf3fb416d36a19958033cdbf5cc313556fa0201b..0a49769bfa83d0b9c435e3ab4bba8597 // Paper start - add parameters and int ret type spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6aec9535f73a79439c6325095c8adf140891035a..7601342f6228df2c72c5c6fabff21a9fe59d1620 100644 +index fb990b96f8690b93813b8b1cb81cd883575f0596..47fa4dbe21d19596a6249c46b69fe925be2d820d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2180,6 +2180,11 @@ public final class CraftServer implements Server { +@@ -2183,6 +2183,11 @@ public final class CraftServer implements Server { @Override public int getSpawnLimit(SpawnCategory spawnCategory) { diff --git a/patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch index 2fd2ec6ea0..7a29a8cb5e 100644 --- a/patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7601342f6228df2c72c5c6fabff21a9fe59d1620..037cc496670c08fbee3fda1ca192758a7cad577c 100644 +index 47fa4dbe21d19596a6249c46b69fe925be2d820d..fccd8b4e94c7db26f63e20830da8cbda4a724a5e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2353,6 +2353,90 @@ public final class CraftServer implements Server { +@@ -2356,6 +2356,90 @@ public final class CraftServer implements Server { return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME), world); // Paper - Anti-Xray - Add parameters } diff --git a/patches/server/0782-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0782-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index d8fd175237..5cc0345b20 100644 --- a/patches/server/0782-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0782-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -18,12 +18,12 @@ index 0868805c78d991c602d8f1d1b5aeb5c790c13384..6986d5475b090bca60b5ae892512fd5e biomeProvider = gen.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 037cc496670c08fbee3fda1ca192758a7cad577c..ae5421fd85de55eecad2db4041c6552ed0ef04d4 100644 +index fccd8b4e94c7db26f63e20830da8cbda4a724a5e..2d7b861189d871eadf1e9ba29092112e638a4053 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1236,7 +1236,7 @@ public final class CraftServer implements Server { +@@ -1239,7 +1239,7 @@ public final class CraftServer implements Server { List list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata)); - LevelStem worlddimension = this.getServer().registries().compositeAccess().registryOrThrow(Registries.LEVEL_STEM).get(actualDimension); + LevelStem worlddimension = iregistry.get(actualDimension); - WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.type().value()); + WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.type().value(), worlddimension.generator(), this.getHandle().getServer().registryAccess()); // Paper diff --git a/patches/server/0797-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0797-API-for-creating-command-sender-which-forwards-feedb.patch index eb0e7ef710..1b53140931 100644 --- a/patches/server/0797-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/server/0797-API-for-creating-command-sender-which-forwards-feedb.patch @@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ae5421fd85de55eecad2db4041c6552ed0ef04d4..3b5295b1ee2c2a7614b46ac4798efd55baff2815 100644 +index 2d7b861189d871eadf1e9ba29092112e638a4053..59d31a6aa22e317c026b576f878deeebcd4b59ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2014,6 +2014,13 @@ public final class CraftServer implements Server { +@@ -2017,6 +2017,13 @@ public final class CraftServer implements Server { return console.console; } diff --git a/patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index 431d48f396..9fbf4e1c4a 100644 --- a/patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit Copies appropriate checks from CraftWorld#getSpawnLimit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3b5295b1ee2c2a7614b46ac4798efd55baff2815..b248468fca0b2000734f48432fa9df4d0c2ce9df 100644 +index 59d31a6aa22e317c026b576f878deeebcd4b59ed..f1b201cfe3796fd0ae0e3ce4ad72f971c191d936 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2188,6 +2188,8 @@ public final class CraftServer implements Server { +@@ -2191,6 +2191,8 @@ public final class CraftServer implements Server { @Override public int getSpawnLimit(SpawnCategory spawnCategory) { // Paper start diff --git a/patches/server/0802-Add-GameEvent-tags.patch b/patches/server/0802-Add-GameEvent-tags.patch index 060101f240..07c56b9977 100644 --- a/patches/server/0802-Add-GameEvent-tags.patch +++ b/patches/server/0802-Add-GameEvent-tags.patch @@ -46,10 +46,10 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b248468fca0b2000734f48432fa9df4d0c2ce9df..6193dcaa8e771edeff7cd38df4e8db2f88bf4564 100644 +index f1b201cfe3796fd0ae0e3ce4ad72f971c191d936..6869f80f87e97a366e773421995e3daea9a01c91 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2599,6 +2599,15 @@ public final class CraftServer implements Server { +@@ -2602,6 +2602,15 @@ public final class CraftServer implements Server { return (org.bukkit.Tag) new CraftEntityTag(BuiltInRegistries.ENTITY_TYPE, entityTagKey); } } @@ -65,7 +65,7 @@ index b248468fca0b2000734f48432fa9df4d0c2ce9df..6193dcaa8e771edeff7cd38df4e8db2f default -> throw new IllegalArgumentException(); } -@@ -2631,6 +2640,13 @@ public final class CraftServer implements Server { +@@ -2634,6 +2643,13 @@ public final class CraftServer implements Server { net.minecraft.core.Registry> entityTags = BuiltInRegistries.ENTITY_TYPE; return entityTags.getTags().map(pair -> (org.bukkit.Tag) new CraftEntityTag(entityTags, pair.getFirst())).collect(ImmutableList.toImmutableList()); } diff --git a/patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch index 1e36ce2c69..1634c5bbe6 100644 --- a/patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch +++ b/patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch @@ -23,10 +23,10 @@ index d2409599c9d9765a2e1dc7418339923049abc416..f42d7d9e11542370489fcc8dc42ea6ec if (worlddata.getCustomBossEvents() != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6193dcaa8e771edeff7cd38df4e8db2f88bf4564..c9570b5f137beace01fccb38dae28e14b50e9aeb 100644 +index 6869f80f87e97a366e773421995e3daea9a01c91..4b236b3cf47f045e423237eb3d1ee085b0a0dc3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1265,10 +1265,11 @@ public final class CraftServer implements Server { +@@ -1268,10 +1268,11 @@ public final class CraftServer implements Server { return null; } diff --git a/patches/server/0810-Custom-Potion-Mixes.patch b/patches/server/0810-Custom-Potion-Mixes.patch index d78d0897fa..9ee08fa443 100644 --- a/patches/server/0810-Custom-Potion-Mixes.patch +++ b/patches/server/0810-Custom-Potion-Mixes.patch @@ -164,7 +164,7 @@ index 3d688e334c7287f41460bd866bfd1155e8bb55d2..55006724ccec9f3de828ec18693728e9 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c9570b5f137beace01fccb38dae28e14b50e9aeb..f8a729b4429c4b9b508c81bcffd281c31c6a7a15 100644 +index 4b236b3cf47f045e423237eb3d1ee085b0a0dc3a..9b79c6e91c6526f902fb78102fa454027315fbf6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -298,6 +298,7 @@ public final class CraftServer implements Server { @@ -184,7 +184,7 @@ index c9570b5f137beace01fccb38dae28e14b50e9aeb..f8a729b4429c4b9b508c81bcffd281c3 MobEffects.BLINDNESS.getClass(); PotionEffectType.stopAcceptingRegistrations(); // Ugly hack :( -@@ -2920,5 +2921,10 @@ public final class CraftServer implements Server { +@@ -2923,5 +2924,10 @@ public final class CraftServer implements Server { return datapackManager; } diff --git a/patches/server/0822-Fix-saving-in-unloadWorld.patch b/patches/server/0822-Fix-saving-in-unloadWorld.patch index c04928c276..fdf8cdf39b 100644 --- a/patches/server/0822-Fix-saving-in-unloadWorld.patch +++ b/patches/server/0822-Fix-saving-in-unloadWorld.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix saving in unloadWorld Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f8a729b4429c4b9b508c81bcffd281c31c6a7a15..67dc0c58988a502dea300cc471cfdc311208abf5 100644 +index 9b79c6e91c6526f902fb78102fa454027315fbf6..2534536d3ffcc4ac17d723e0d37c55a4bb5d0ec9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1313,7 +1313,7 @@ public final class CraftServer implements Server { +@@ -1316,7 +1316,7 @@ public final class CraftServer implements Server { try { if (save) { diff --git a/patches/server/0838-WorldCreator-keepSpawnLoaded.patch b/patches/server/0838-WorldCreator-keepSpawnLoaded.patch index 906f699fed..f94c503b94 100644 --- a/patches/server/0838-WorldCreator-keepSpawnLoaded.patch +++ b/patches/server/0838-WorldCreator-keepSpawnLoaded.patch @@ -5,10 +5,10 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 67dc0c58988a502dea300cc471cfdc311208abf5..03cffc87cfc82f1f6f96e8cfc0e37472fc50d38b 100644 +index 2534536d3ffcc4ac17d723e0d37c55a4bb5d0ec9..3aa0bd14a6773288cf0a846c8be45ddd567a4e7c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1272,6 +1272,7 @@ public final class CraftServer implements Server { +@@ -1275,6 +1275,7 @@ public final class CraftServer implements Server { internal.setSpawnSettings(true, true); // Paper - move up diff --git a/patches/server/0854-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0854-Throw-exception-on-world-create-while-being-ticked.patch index 71518b7861..66365de5f6 100644 --- a/patches/server/0854-Throw-exception-on-world-create-while-being-ticked.patch +++ b/patches/server/0854-Throw-exception-on-world-create-while-being-ticked.patch @@ -45,7 +45,7 @@ index a8b3f0e8be414c4ea92cc85c9811ecd42e5ce9c1..0e04083ff0598451c66731b1518b2eb6 this.profiler.popPush("connection"); MinecraftTimings.connectionTimer.startTiming(); // Spigot diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 03cffc87cfc82f1f6f96e8cfc0e37472fc50d38b..d3b4fef3696c9999912fd37034ea7e1d6755c9ef 100644 +index 3aa0bd14a6773288cf0a846c8be45ddd567a4e7c..aa713ea0a44f578b80e194353519ec24a8a0c8f8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -868,6 +868,11 @@ public final class CraftServer implements Server { @@ -68,7 +68,7 @@ index 03cffc87cfc82f1f6f96e8cfc0e37472fc50d38b..d3b4fef3696c9999912fd37034ea7e1d Validate.notNull(creator, "Creator may not be null"); String name = creator.name(); -@@ -1287,6 +1293,7 @@ public final class CraftServer implements Server { +@@ -1290,6 +1296,7 @@ public final class CraftServer implements Server { @Override public boolean unloadWorld(World world, boolean save) { diff --git a/patches/server/0861-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0861-Don-t-broadcast-messages-to-command-blocks.patch index bf84ae28e1..6c30ca9f59 100644 --- a/patches/server/0861-Don-t-broadcast-messages-to-command-blocks.patch +++ b/patches/server/0861-Don-t-broadcast-messages-to-command-blocks.patch @@ -20,10 +20,10 @@ index 7c7e5f3c0f9cd1f16192a8fc8163da9b2d9519d5..888936385196a178ab8b730fd5e4fff4 Date date = new Date(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d3b4fef3696c9999912fd37034ea7e1d6755c9ef..afadd1b5dd7c46c1b8f46e222ed16489dcc10e79 100644 +index aa713ea0a44f578b80e194353519ec24a8a0c8f8..a940aead1076b44d8da1d5b84da8b297a0ebab8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1787,7 +1787,7 @@ public final class CraftServer implements Server { +@@ -1790,7 +1790,7 @@ public final class CraftServer implements Server { // Paper end Set recipients = new HashSet<>(); for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) { diff --git a/work/CraftBukkit b/work/CraftBukkit index ab1586c2fb..2ed3e3e6e5 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit ab1586c2fb5fa7a381e6191e1137acc69aeebbf2 +Subproject commit 2ed3e3e6e50cb606709522d4476f98e9edc5e79c