diff --git a/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch deleted file mode 100644 index e0627ff0bc..0000000000 --- a/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Wed, 1 Jul 2020 03:12:06 -0400 -Subject: [PATCH] Clean up duplicated GameProfile Properties - -We had a bug where we accidently cloned properties resulting in skulls -growing to large sizes and preventing login. - -This now automatically cleans up the extra properties. - -diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java -index 7bc60901297d27d88efb401d02b4bc06d8b28874..6dac24354192bea79a4b9eb721543110826790b2 100644 ---- a/src/main/java/net/minecraft/nbt/NbtUtils.java -+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java -@@ -94,7 +94,8 @@ public final class NbtUtils { - for(String string2 : compoundTag.getAllKeys()) { - ListTag listTag = compoundTag.getList(string2, 10); - -- for(int i = 0; i < listTag.size(); ++i) { -+ if (listTag.size() == 0) continue; // Paper - remove duplicate properties -+ for (int i = listTag.size() - 1; i < listTag.size(); ++i) { // Paper - remove duplicate properties - CompoundTag compoundTag2 = listTag.getCompound(i); - String string3 = compoundTag2.getString("Value"); - if (compoundTag2.contains("Signature", 8)) { -diff --git a/src/main/java/net/minecraft/world/item/PlayerHeadItem.java b/src/main/java/net/minecraft/world/item/PlayerHeadItem.java -index 98465d012357b76103d73952527c43c317d0f1bd..4969353e3a02ad70d973ae8780d018710f2462a3 100644 ---- a/src/main/java/net/minecraft/world/item/PlayerHeadItem.java -+++ b/src/main/java/net/minecraft/world/item/PlayerHeadItem.java -@@ -53,6 +53,18 @@ public class PlayerHeadItem extends StandingAndWallBlockItem { - }); - // CraftBukkit start - } else { -+ // Paper start - clean up old duplicated properties -+ CompoundTag properties = nbt.getCompound("SkullOwner").getCompound("Properties"); -+ for (String key : properties.getAllKeys()) { -+ net.minecraft.nbt.ListTag values = properties.getList(key, 10); -+ if (values.size() > 1) { -+ net.minecraft.nbt.Tag texture = values.get(values.size() - 1); -+ values = new net.minecraft.nbt.ListTag(); -+ values.add(texture); -+ properties.put(key, values); -+ } -+ } -+ // Paper end - net.minecraft.nbt.ListTag textures = nbt.getCompound("SkullOwner").getCompound("Properties").getList("textures", 10); // Safe due to method contracts - for (int i = 0; i < textures.size(); i++) { - if (textures.get(i) instanceof CompoundTag && !((CompoundTag) textures.get(i)).contains("Signature", 8) && ((CompoundTag) textures.get(i)).getString("Value").trim().isEmpty()) { diff --git a/patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0427-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0427-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0429-Remove-some-streams-from-structures.patch b/patches/server/0428-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0429-Remove-some-streams-from-structures.patch rename to patches/server/0428-Remove-some-streams-from-structures.patch diff --git a/patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0429-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0429-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0431-Support-components-in-ItemMeta.patch b/patches/server/0430-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0431-Support-components-in-ItemMeta.patch rename to patches/server/0430-Support-components-in-ItemMeta.patch diff --git a/patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0431-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0431-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0433-Add-entity-liquid-API.patch b/patches/server/0432-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0433-Add-entity-liquid-API.patch rename to patches/server/0432-Add-entity-liquid-API.patch diff --git a/patches/server/0434-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0433-Update-itemstack-legacy-name-and-lore.patch similarity index 97% rename from patches/server/0434-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0433-Update-itemstack-legacy-name-and-lore.patch index 09c79dec73..d9936812c2 100644 --- a/patches/server/0434-Update-itemstack-legacy-name-and-lore.patch +++ b/patches/server/0433-Update-itemstack-legacy-name-and-lore.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 7d80eded30109982fd3a1b815ba5dff4b699689a..dcb01c399d2b30d907bfc51584215d9300b6d23e 100644 +index 0caf3eeb7984e842f7a0bdfed3021d0b231a0dd0..ee274fb9c8292a807e438902cc5d7f49c30d6627 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -171,6 +171,44 @@ public final class ItemStack { diff --git a/patches/server/0435-Spawn-player-in-correct-world-on-login.patch b/patches/server/0434-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0435-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0434-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0436-Add-PrepareResultEvent.patch b/patches/server/0435-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0436-Add-PrepareResultEvent.patch rename to patches/server/0435-Add-PrepareResultEvent.patch diff --git a/patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0438-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0438-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0439-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0439-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0441-Fix-SPIGOT-5989.patch b/patches/server/0440-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0441-Fix-SPIGOT-5989.patch rename to patches/server/0440-Fix-SPIGOT-5989.patch diff --git a/patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0445-Fix-some-rails-connecting-improperly.patch b/patches/server/0444-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0445-Fix-some-rails-connecting-improperly.patch rename to patches/server/0444-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0448-Brand-support.patch b/patches/server/0447-Brand-support.patch similarity index 97% rename from patches/server/0448-Brand-support.patch rename to patches/server/0447-Brand-support.patch index 4dec718233..ccf552be2b 100644 --- a/patches/server/0448-Brand-support.patch +++ b/patches/server/0447-Brand-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6f3cd16845d5ea265666f5535b7f893e0a9d0fcf..a37a29d771511b960c6c033b649833c223f40990 100644 +index 2f0fb75a35a1fa45614621da9e24cec6e842b693..a10e4d99bd7e6588cd09d17ebcc3e68f05b9e87b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -304,6 +304,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0448-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0448-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0450-Don-t-require-FACING-data.patch b/patches/server/0449-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0450-Don-t-require-FACING-data.patch rename to patches/server/0449-Don-t-require-FACING-data.patch diff --git a/patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0450-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0450-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0452-Add-moon-phase-API.patch b/patches/server/0451-Add-moon-phase-API.patch similarity index 90% rename from patches/server/0452-Add-moon-phase-API.patch rename to patches/server/0451-Add-moon-phase-API.patch index ce85e5101a..afc9659d98 100644 --- a/patches/server/0452-Add-moon-phase-API.patch +++ b/patches/server/0451-Add-moon-phase-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 4dc5c75d1fa0748b6e7e95d90b92a865b2f6362e..0452a59d6eec947589b4791c977327046f7b0d6e 100644 +index 91fbc67eefea473211b99e4338f6464f58dc5592..b5981001d8ad4d6c79b965be9a446352971b0d29 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -980,4 +980,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0453-Prevent-headless-pistons-from-being-created.patch b/patches/server/0452-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0453-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0452-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0454-Add-BellRingEvent.patch b/patches/server/0453-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0454-Add-BellRingEvent.patch rename to patches/server/0453-Add-BellRingEvent.patch diff --git a/patches/server/0455-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0454-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0455-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0454-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0456-Buffer-joins-to-world.patch b/patches/server/0455-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0456-Buffer-joins-to-world.patch rename to patches/server/0455-Buffer-joins-to-world.patch diff --git a/patches/server/0457-Eigencraft-redstone-implementation.patch b/patches/server/0456-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0457-Eigencraft-redstone-implementation.patch rename to patches/server/0456-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0457-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0457-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0458-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0458-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0460-Add-more-Evoker-API.patch b/patches/server/0459-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0460-Add-more-Evoker-API.patch rename to patches/server/0459-Add-more-Evoker-API.patch diff --git a/patches/server/0461-Add-methods-to-get-translation-keys.patch b/patches/server/0460-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0461-Add-methods-to-get-translation-keys.patch rename to patches/server/0460-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0462-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0461-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0462-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0461-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0463-Cache-block-data-strings.patch b/patches/server/0462-Cache-block-data-strings.patch similarity index 97% rename from patches/server/0463-Cache-block-data-strings.patch rename to patches/server/0462-Cache-block-data-strings.patch index 2e4525b8b8..d706e7fb92 100644 --- a/patches/server/0463-Cache-block-data-strings.patch +++ b/patches/server/0462-Cache-block-data-strings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 56e98ea2964c2779537ac607b7c4677bc695d92a..0ed8add0a2acec7d109f9687b7d77967a7ccdf3e 100644 +index f704725928b0ec05ffff554901e7558ef8f308d6..1a8bc8d508202012130441397fe1a404fb1357fd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2049,6 +2049,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7d70b03b7b5e283ce5cbeb99d2cb61a48cc70932..c6a1e8246ac22e83121cb17eee8e00ab1dd48306 100644 +index 87f3ac68e8e60ac8c890280d491c326a1575f810..a82b911450feb011cc8776a0dece478bb94d4221 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -509,6 +509,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0491-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0490-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0491-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0490-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0492-Expose-world-spawn-angle.patch b/patches/server/0491-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0492-Expose-world-spawn-angle.patch rename to patches/server/0491-Expose-world-spawn-angle.patch diff --git a/patches/server/0493-Add-Destroy-Speed-API.patch b/patches/server/0492-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0493-Add-Destroy-Speed-API.patch rename to patches/server/0492-Add-Destroy-Speed-API.patch diff --git a/patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0495-Add-LivingEntity-clearActiveItem.patch b/patches/server/0494-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0495-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0494-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0496-Add-PlayerItemCooldownEvent.patch b/patches/server/0495-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0496-Add-PlayerItemCooldownEvent.patch rename to patches/server/0495-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0497-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0496-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0497-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0496-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0498-More-lightning-API.patch b/patches/server/0497-More-lightning-API.patch similarity index 100% rename from patches/server/0498-More-lightning-API.patch rename to patches/server/0497-More-lightning-API.patch diff --git a/patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch index dac4a4af6f..cf434759e9 100644 --- a/patches/server/0499-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a0718a0cc2ed15a5350b1ee77747d93c6a92048d..57b85654c5af2e3c3681e3a03c11d5a02703749d 100644 +index 73a2ddf2806ea1e1826d553b7d13cf4d58be43fc..01c5a986d7d5c87cb7bf574a2f59e57dd5b347e2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2049,6 +2049,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0500-Added-missing-default-perms-for-commands.patch b/patches/server/0499-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0500-Added-missing-default-perms-for-commands.patch rename to patches/server/0499-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0501-Add-PlayerShearBlockEvent.patch b/patches/server/0500-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0501-Add-PlayerShearBlockEvent.patch rename to patches/server/0500-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0502-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0501-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0502-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0501-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0503-Limit-recipe-packets.patch b/patches/server/0502-Limit-recipe-packets.patch similarity index 96% rename from patches/server/0503-Limit-recipe-packets.patch rename to patches/server/0502-Limit-recipe-packets.patch index 2b8a90f801..ab3ff245f3 100644 --- a/patches/server/0503-Limit-recipe-packets.patch +++ b/patches/server/0502-Limit-recipe-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 25a01e0a6dc87bc5785d1ede6a7344fcdc9daf7e..e1999066bb12d39a03dca00f99618045b2cee471 100644 +index a82b911450feb011cc8776a0dece478bb94d4221..9f9db1234a8b14fbb53a1293f0ffe2b51d652c5e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -268,6 +268,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0504-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0503-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0504-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0503-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0505-Player-Chunk-Load-Unload-Events.patch b/patches/server/0504-Player-Chunk-Load-Unload-Events.patch similarity index 94% rename from patches/server/0505-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0504-Player-Chunk-Load-Unload-Events.patch index 06e072f1b0..0706058aa6 100644 --- a/patches/server/0505-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0504-Player-Chunk-Load-Unload-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index abde8074da754667d65f3894097ad2255c97f3f0..fa9c1f323ef372c8a8210118eae0558da58c3c4e 100644 +index 0b81878a951643af1ce785b3adcca9b3eec7f1c3..4581bdf4525c05df235e47ab772fbf5c5f2d6b50 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2232,11 +2232,21 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0506-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0505-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0506-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0505-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0507-Expose-LivingEntity-hurt-direction.patch b/patches/server/0506-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0507-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0506-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0508-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0508-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0509-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0509-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0510-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0510-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0511-Implement-TargetHitEvent.patch b/patches/server/0510-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0511-Implement-TargetHitEvent.patch rename to patches/server/0510-Implement-TargetHitEvent.patch diff --git a/patches/server/0512-MC-4-Fix-item-position-desync.patch b/patches/server/0511-MC-4-Fix-item-position-desync.patch similarity index 96% rename from patches/server/0512-MC-4-Fix-item-position-desync.patch rename to patches/server/0511-MC-4-Fix-item-position-desync.patch index 9cc14419e4..8d6bf2c087 100644 --- a/patches/server/0512-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0511-MC-4-Fix-item-position-desync.patch @@ -28,7 +28,7 @@ index 5ca3ad7b3d7606accd0a58b3c708fadb349608f7..4b6e0fe2fabcc55007fd8979e81f66df public Vec3 decode(long x, long y, long z) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 57b85654c5af2e3c3681e3a03c11d5a02703749d..7d244133234c35f8f5f3769d8fd8aacba9a65998 100644 +index 01c5a986d7d5c87cb7bf574a2f59e57dd5b347e2..1bca9f5d58c5adfff3610ab1e7296de3647adaec 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4221,6 +4221,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0513-Additional-Block-Material-API-s.patch b/patches/server/0512-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0513-Additional-Block-Material-API-s.patch rename to patches/server/0512-Additional-Block-Material-API-s.patch diff --git a/patches/server/0514-Fix-harming-potion-dupe.patch b/patches/server/0513-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0514-Fix-harming-potion-dupe.patch rename to patches/server/0513-Fix-harming-potion-dupe.patch diff --git a/patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0515-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0516-Cache-burn-durations.patch b/patches/server/0515-Cache-burn-durations.patch similarity index 100% rename from patches/server/0516-Cache-burn-durations.patch rename to patches/server/0515-Cache-burn-durations.patch diff --git a/patches/server/0517-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0517-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0518-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0517-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0518-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0517-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0519-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0518-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0519-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0518-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0520-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0519-Fix-interact-event-not-being-called-sometimes.patch similarity index 97% rename from patches/server/0520-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0519-Fix-interact-event-not-being-called-sometimes.patch index 9637f2fe59..0cb82384ef 100644 --- a/patches/server/0520-Fix-interact-event-not-being-called-sometimes.patch +++ b/patches/server/0519-Fix-interact-event-not-being-called-sometimes.patch @@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes Co-authored-by: Moulberry diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c1636c313994dc4b3ae4c19fc66137bd080a501c..ec1d92a71518b9329e81f12bc8ccef846fefc168 100644 +index 9f9db1234a8b14fbb53a1293f0ffe2b51d652c5e..d0fee1a4d728213a6b0c9bf9f26101d1a5bbec9f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1839,7 +1839,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0521-Zombie-API-breaking-doors.patch b/patches/server/0520-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0521-Zombie-API-breaking-doors.patch rename to patches/server/0520-Zombie-API-breaking-doors.patch diff --git a/patches/server/0522-Fix-nerfed-slime-when-splitting.patch b/patches/server/0521-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0522-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0521-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0523-Add-EntityLoadCrossbowEvent.patch b/patches/server/0522-Add-EntityLoadCrossbowEvent.patch similarity index 96% rename from patches/server/0523-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0522-Add-EntityLoadCrossbowEvent.patch index b535c7b3fd..07e5946fbf 100644 --- a/patches/server/0523-Add-EntityLoadCrossbowEvent.patch +++ b/patches/server/0522-Add-EntityLoadCrossbowEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityLoadCrossbowEvent diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java -index 9bea5e94c246d843f3d67680ffb57075bd9d3467..a433910fb4d0bd8d7b6b0d66c8fc88d62a0e4879 100644 +index ba570f1c9654e1004e068a1efe2118f36c954505..eede02c3f125d230af537bb67bebed9b88f7d1b4 100644 --- a/src/main/java/net/minecraft/world/item/CrossbowItem.java +++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java @@ -89,7 +89,14 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable { diff --git a/patches/server/0524-Added-WorldGameRuleChangeEvent.patch b/patches/server/0523-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0524-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0523-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0525-Added-ServerResourcesReloadedEvent.patch b/patches/server/0524-Added-ServerResourcesReloadedEvent.patch similarity index 97% rename from patches/server/0525-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0524-Added-ServerResourcesReloadedEvent.patch index 4ba0ccdc24..2d4965470a 100644 --- a/patches/server/0525-Added-ServerResourcesReloadedEvent.patch +++ b/patches/server/0524-Added-ServerResourcesReloadedEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 412e5db21a83e9ca6ba5aa0d457507ce51176ebc..d29b66d9db69309087ee2eac2561ab2fcd797eb8 100644 +index 8ca3bb41307f1f7ba1b1340981cc37e331fa9388..676ec9a9b087f7f1e46a3dc3d967594c0cfbcd87 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2009,7 +2009,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c0c74f9b851bacc4079bc156b80bc7e2950c45e3..5ed9ab2e261d64234c388d4bfdc27d31cf112117 100644 +index fff82d1fde56ff8ca564b3209877dedc0b384c20..3c6e4819065786c89773476edf89b5d88db8559d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -516,7 +516,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0639-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0638-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0639-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0638-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0639-Don-t-apply-cramming-damage-to-players.patch similarity index 94% rename from patches/server/0640-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0639-Don-t-apply-cramming-damage-to-players.patch index a423c75fc2..27268bcd9e 100644 --- a/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0639-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 478dbba3519f8d2fdd4b203756403761ccad553b..deaf1fcb189ba1382f2b52d12afa12463874f7ec 100644 +index 0a25e2bb95fa249fa5cde1a174702bb311a45171..eaa1b300870f3bbf5a34cb99e6af116b7c244628 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -100,6 +100,7 @@ import net.minecraft.util.Mth; diff --git a/patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0640-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0640-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0641-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0641-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0643-Stinger-API.patch b/patches/server/0642-Stinger-API.patch similarity index 93% rename from patches/server/0643-Stinger-API.patch rename to patches/server/0642-Stinger-API.patch index 2ff2986a81..06a76158c0 100644 --- a/patches/server/0643-Stinger-API.patch +++ b/patches/server/0642-Stinger-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index afcf10fa6a4446698cd00ac94dded0f61297880c..dc82cc9f6ab09224a82c2a03e9e49b8f1f527733 100644 +index 92578adeab74b53e2001262986f883913aa15f05..df1ac9a3e3a3551a798432ded2ba90a3c11db72f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -338,7 +338,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0645-Add-System.out-err-catcher.patch b/patches/server/0644-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0645-Add-System.out-err-catcher.patch rename to patches/server/0644-Add-System.out-err-catcher.patch diff --git a/patches/server/0646-Fix-test-not-bootstrapping.patch b/patches/server/0645-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0646-Fix-test-not-bootstrapping.patch rename to patches/server/0645-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0648-Improve-boat-collision-performance.patch b/patches/server/0647-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0648-Improve-boat-collision-performance.patch rename to patches/server/0647-Improve-boat-collision-performance.patch diff --git a/patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch index 9dccdbeb2b..812b682bf9 100644 --- a/patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5ed9ab2e261d64234c388d4bfdc27d31cf112117..d4f989c409d16864ffc0535afed546a2a7325ffc 100644 +index 3c6e4819065786c89773476edf89b5d88db8559d..75ea5d01a515dcc604a1414d7261887ca71b243e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -433,7 +433,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0651-Add-PlayerSetSpawnEvent.patch b/patches/server/0650-Add-PlayerSetSpawnEvent.patch similarity index 99% rename from patches/server/0651-Add-PlayerSetSpawnEvent.patch rename to patches/server/0650-Add-PlayerSetSpawnEvent.patch index ab8aa29979..3b0c94b6e2 100644 --- a/patches/server/0651-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0650-Add-PlayerSetSpawnEvent.patch @@ -187,7 +187,7 @@ index 1a27b7faa22e6b3dc5fce329ed06425de56c4315..b9903c29bdea8d1e3b6fce0e97be6bd9 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f94fa71039ebd0e638745a0cd7ca86b98ecb9b5e..56418e69c8872f99efced7ca504274697db65eaa 100644 +index 04979441a1e654d978b858acb2219da6615ed8a6..0e753ae3a5db5406d779371bcb5c791bdf93c261 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1321,9 +1321,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0652-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0652-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0653-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0652-Optimize-entity-tracker-passenger-checks.patch similarity index 90% rename from patches/server/0653-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0652-Optimize-entity-tracker-passenger-checks.patch index 80e615822e..fb65af2e4d 100644 --- a/patches/server/0653-Optimize-entity-tracker-passenger-checks.patch +++ b/patches/server/0652-Optimize-entity-tracker-passenger-checks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize entity tracker passenger checks diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index f578bfa3a2ae7f29999f9e551f687ae820bbbb80..e0477658849c9e9c6aebed621e8b11c32db86af8 100644 +index d1bcc1f9816826391b7ba7c79e3b1c2c013933de..12820b5f8a3da042f04787b36cc6b6c7d15f803f 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -76,7 +76,7 @@ public class ServerEntity { diff --git a/patches/server/0654-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0653-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0654-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0653-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0655-Added-EntityDamageItemEvent.patch b/patches/server/0654-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0655-Added-EntityDamageItemEvent.patch rename to patches/server/0654-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0656-Optimize-indirect-passenger-iteration.patch b/patches/server/0655-Optimize-indirect-passenger-iteration.patch similarity index 96% rename from patches/server/0656-Optimize-indirect-passenger-iteration.patch rename to patches/server/0655-Optimize-indirect-passenger-iteration.patch index d9ce7834c4..9648fe809d 100644 --- a/patches/server/0656-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0655-Optimize-indirect-passenger-iteration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 205be31a06f97678aea0da06bc13f5a18b6eb903..f99feb964e4da1bcb49fc643e207115fe4c3c68b 100644 +index e3024f2fff1cd8de618216a42716da8caf37d5be..7802d3d9274c9083a89b9f62441194e8a0d8975b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3882,20 +3882,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch similarity index 93% rename from patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch index 88b526e1cf..4cb10a6ef3 100644 --- a/patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch +++ b/patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index e0477658849c9e9c6aebed621e8b11c32db86af8..f56291dae2fdf4b54dd673e1b98dc39a94f42a9e 100644 +index 12820b5f8a3da042f04787b36cc6b6c7d15f803f..f8b3d633e788c3d6cb5b53e606fa798a42582460 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -114,7 +114,7 @@ public class ServerEntity { diff --git a/patches/server/0658-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0657-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0658-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0657-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0659-Clear-bucket-NBT-after-dispense.patch b/patches/server/0658-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0659-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0658-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0661-Add-BlockBreakBlockEvent.patch b/patches/server/0660-Add-BlockBreakBlockEvent.patch similarity index 98% rename from patches/server/0661-Add-BlockBreakBlockEvent.patch rename to patches/server/0660-Add-BlockBreakBlockEvent.patch index 83bda7fe59..7dcc487c07 100644 --- a/patches/server/0661-Add-BlockBreakBlockEvent.patch +++ b/patches/server/0660-Add-BlockBreakBlockEvent.patch @@ -33,7 +33,7 @@ index 36b196c8834c4eb873bfca0b12f1fc2b421ea071..9522e646529f3d849471931b4b3c0d13 public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) { if (world instanceof ServerLevel) { diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java -index 9abae63e06c1dde9b8434d32bac8798808428d10..9b3d253c4224410719bf778a4688fce13c12069d 100644 +index e14967a745c21ff48a88fa0f22cc296a73b43d92..8125c334c54d41ad731bbc3481662b0cf0afee51 100644 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java @@ -401,7 +401,7 @@ public class PistonBaseBlock extends DirectionalBlock { diff --git a/patches/server/0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0663-More-CommandBlock-API.patch b/patches/server/0662-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0663-More-CommandBlock-API.patch rename to patches/server/0662-More-CommandBlock-API.patch diff --git a/patches/server/0664-Add-missing-team-sidebar-display-slots.patch b/patches/server/0663-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0664-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0663-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0665-Add-back-EntityPortalExitEvent.patch b/patches/server/0664-Add-back-EntityPortalExitEvent.patch similarity index 97% rename from patches/server/0665-Add-back-EntityPortalExitEvent.patch rename to patches/server/0664-Add-back-EntityPortalExitEvent.patch index 02d6cbd947..2e93344df1 100644 --- a/patches/server/0665-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0664-Add-back-EntityPortalExitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7802d3d9274c9083a89b9f62441194e8a0d8975b..060fbc163b0ee8fc0baa4e18d18d25830353e0a9 100644 +index 7802d3d9274c9083a89b9f62441194e8a0d8975b..f7a97ac4eb851f35275cfeb4717f0f69dda4336e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3329,6 +3329,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0667-Get-entity-default-attributes.patch b/patches/server/0666-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0667-Get-entity-default-attributes.patch rename to patches/server/0666-Get-entity-default-attributes.patch diff --git a/patches/server/0668-Left-handed-API.patch b/patches/server/0667-Left-handed-API.patch similarity index 100% rename from patches/server/0668-Left-handed-API.patch rename to patches/server/0667-Left-handed-API.patch diff --git a/patches/server/0669-Add-more-advancement-API.patch b/patches/server/0668-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0669-Add-more-advancement-API.patch rename to patches/server/0668-Add-more-advancement-API.patch diff --git a/patches/server/0670-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0670-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0671-Add-critical-damage-API.patch b/patches/server/0670-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0671-Add-critical-damage-API.patch rename to patches/server/0670-Add-critical-damage-API.patch diff --git a/patches/server/0672-Fix-issues-with-mob-conversion.patch b/patches/server/0671-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0672-Fix-issues-with-mob-conversion.patch rename to patches/server/0671-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0673-Add-isCollidable-methods-to-various-places.patch b/patches/server/0672-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0673-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0672-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0674-Goat-ram-API.patch b/patches/server/0673-Goat-ram-API.patch similarity index 100% rename from patches/server/0674-Goat-ram-API.patch rename to patches/server/0673-Goat-ram-API.patch diff --git a/patches/server/0675-Add-API-for-resetting-a-single-score.patch b/patches/server/0674-Add-API-for-resetting-a-single-score.patch similarity index 91% rename from patches/server/0675-Add-API-for-resetting-a-single-score.patch rename to patches/server/0674-Add-API-for-resetting-a-single-score.patch index c2e1fd93b9..0983cd3cdf 100644 --- a/patches/server/0675-Add-API-for-resetting-a-single-score.patch +++ b/patches/server/0674-Add-API-for-resetting-a-single-score.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add API for resetting a single score It was only possible to reset all scores for a specific entry, instead of resetting only specific scores. diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java -index 2c4ffed5e828f051c44f494a8ed599a8197d7450..3b26793b67282c3a20c023b9c13a2a9b54d5d932 100644 +index 024c138082d68291db161a9ca3d233ef27788097..e5898f391e18fe5da9affd9321d1f34bba0af2d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java @@ -68,4 +68,12 @@ final class CraftScore implements Score { diff --git a/patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0677-Vanilla-command-permission-fixes.patch b/patches/server/0676-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0677-Vanilla-command-permission-fixes.patch rename to patches/server/0676-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 97% rename from patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index 51a8fd4611..8df11691d3 100644 --- a/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -28,7 +28,7 @@ index e809a959d69197ecdec768a2d4f348c73c0d5b9a..0f6d4f80677c54a94a1bbfb861a3bcce } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c06e81d5448364154d9fb4fb68c1867d04daeb97..1511d45eb61e72e73bc17cfe03fbb6c22f9dd128 100644 +index 59e02bd5b49e0c900d049a1f1927316d45910768..ce2972c62f91724f6a9e56c8103fba219f7a60bb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1615,6 +1615,18 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0679-Fix-GameProfileCache-concurrency.patch b/patches/server/0678-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0679-Fix-GameProfileCache-concurrency.patch rename to patches/server/0678-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0680-Improve-and-expand-AsyncCatcher.patch b/patches/server/0679-Improve-and-expand-AsyncCatcher.patch similarity index 98% rename from patches/server/0680-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0679-Improve-and-expand-AsyncCatcher.patch index 8cffa38f71..9b4cc3bf89 100644 --- a/patches/server/0680-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0679-Improve-and-expand-AsyncCatcher.patch @@ -17,7 +17,7 @@ Async catch modifications to critical entity state Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d4f989c409d16864ffc0535afed546a2a7325ffc..03d75644a2f2a76022bb8f18d64ccbd35fc93d4a 100644 +index 75ea5d01a515dcc604a1414d7261887ca71b243e..c534dadb3414c487fd3afbf7be71bfcbf55d66ab 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1658,6 +1658,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -166,7 +166,7 @@ index 47bab513feec217d875192afef61f3af95b93d24..d3fb277878adb26c7d80cf21f2707038 PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason}); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index dc82cc9f6ab09224a82c2a03e9e49b8f1f527733..c29067c513531b819e4d48cd8cab3ed036ae1668 100644 +index df1ac9a3e3a3551a798432ded2ba90a3c11db72f..17bb9318262b04c2005bec23bcaf05f3ed06c7db 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -464,6 +464,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0682-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0681-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0682-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0681-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0683-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0682-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0683-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0682-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0684-Optimise-general-POI-access.patch b/patches/server/0683-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0684-Optimise-general-POI-access.patch rename to patches/server/0683-Optimise-general-POI-access.patch diff --git a/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 99% rename from patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch index 9039a81a52..2cd6a73f9c 100644 --- a/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch +++ b/patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch @@ -333,7 +333,7 @@ index 3f5d572994bc8b3f1e106105dc0bb202ad005b8c..5c5fe2087a7617324ab8e18389e3ffa9 } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 1511d45eb61e72e73bc17cfe03fbb6c22f9dd128..7b8e06fc7e2d422ba0e996d6de3f769e995cc6e5 100644 +index ce2972c62f91724f6a9e56c8103fba219f7a60bb..6c00162847b59ffa3d1403b956545c57ba539139 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -273,6 +273,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0686-Optimise-chunk-tick-iteration.patch b/patches/server/0685-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0686-Optimise-chunk-tick-iteration.patch rename to patches/server/0685-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch b/patches/server/0686-Execute-chunk-tasks-mid-tick.patch similarity index 98% rename from patches/server/0687-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0686-Execute-chunk-tasks-mid-tick.patch index e58dbbe393..e5510c741d 100644 --- a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch +++ b/patches/server/0686-Execute-chunk-tasks-mid-tick.patch @@ -19,7 +19,7 @@ index 4d861f9a58f8ea238471af22f387854d855b1801..efbf77024d235d8af9f7efc938c17afd private MinecraftTimings() {} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 09617ff2716b8e75380421e9a19c145806602151..ebd092a3f3c745b3a2f69fd72c04be7a2ab214a2 100644 +index e4cf95705ac73d7333628d2659caec444b750420..32fda33ff9684e08da6e7bee2eb0dc26ed701950 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1303,6 +1303,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 11e37de9481d82bcc9de4aae82a04acd6659f869..afdef7501e6071932d569657d60a39305f5ca4be 100644 +index 7bb601078ef3a983d1807246b91b669ae5d5a8e4..dbc93883b8529b0aab3ea21ddd466bc8c3739351 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2805,7 +2805,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0909-fix-Instruments.patch b/patches/server/0908-fix-Instruments.patch similarity index 100% rename from patches/server/0909-fix-Instruments.patch rename to patches/server/0908-fix-Instruments.patch diff --git a/patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0912-Add-BlockLockCheckEvent.patch b/patches/server/0911-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0912-Add-BlockLockCheckEvent.patch rename to patches/server/0911-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0913-Add-Sneaking-API-for-Entities.patch b/patches/server/0912-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0913-Add-Sneaking-API-for-Entities.patch rename to patches/server/0912-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0914-Improve-logging-and-errors.patch b/patches/server/0913-Improve-logging-and-errors.patch similarity index 97% rename from patches/server/0914-Improve-logging-and-errors.patch rename to patches/server/0913-Improve-logging-and-errors.patch index 92d8022a6d..be32ff3b20 100644 --- a/patches/server/0914-Improve-logging-and-errors.patch +++ b/patches/server/0913-Improve-logging-and-errors.patch @@ -22,7 +22,7 @@ index f6e423a76d4c9cf639f1d44af80d33cf3072f6b5..135fc81414446f24c3adad71f5199c78 Properties properties; Properties properties1; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4aa5ff559cbb46b7badbc960f782ed4035a5e495..4d13bfc159ad5cdf60db25ad19ff6f37c6d16924 100644 +index dbc93883b8529b0aab3ea21ddd466bc8c3739351..d7a4e200853f4eb980f1ea4a5c6a338039979cf1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3622,7 +3622,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0915-Improve-PortalEvents.patch b/patches/server/0914-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0915-Improve-PortalEvents.patch rename to patches/server/0914-Improve-PortalEvents.patch diff --git a/patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch similarity index 92% rename from patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch index 1a4d7c4c10..241343c4cc 100644 --- a/patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch +++ b/patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3d2ca3ae49a85a91773510ca93d60b9b098e39ba..4947265c3b7a9da8782be3ae8d35ef99c5836e81 100644 +index d7a4e200853f4eb980f1ea4a5c6a338039979cf1..4434cad1a854fb514245c4afb3e3d469efb223f9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2259,7 +2259,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0919-Flying-Fall-Damage.patch b/patches/server/0918-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0919-Flying-Fall-Damage.patch rename to patches/server/0918-Flying-Fall-Damage.patch diff --git a/patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0922-config-for-disabling-entity-tag-tags.patch b/patches/server/0921-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0922-config-for-disabling-entity-tag-tags.patch rename to patches/server/0921-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0923-Use-single-player-info-update-packet-on-join.patch b/patches/server/0922-Use-single-player-info-update-packet-on-join.patch similarity index 97% rename from patches/server/0923-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0922-Use-single-player-info-update-packet-on-join.patch index ab4a8bb1c5..d359b7fc8b 100644 --- a/patches/server/0923-Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/0922-Use-single-player-info-update-packet-on-join.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d05c4c34777a33240e4e8f985d6bca76ed45d7f3..460baa53e365b1da3680ba3e0e8b8f4b94a75fc4 100644 +index 4434cad1a854fb514245c4afb3e3d469efb223f9..ce13cd909e50fcc1b63c0a515f18fd1fbd4f6aea 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3637,7 +3637,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0925-Win-Screen-API.patch b/patches/server/0924-Win-Screen-API.patch similarity index 100% rename from patches/server/0925-Win-Screen-API.patch rename to patches/server/0924-Win-Screen-API.patch diff --git a/patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0927-Fix-force-opening-enchantment-tables.patch b/patches/server/0926-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0927-Fix-force-opening-enchantment-tables.patch rename to patches/server/0926-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0928-Add-Entity-Body-Yaw-API.patch b/patches/server/0927-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0928-Add-Entity-Body-Yaw-API.patch rename to patches/server/0927-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0931-Add-EntityFertilizeEggEvent.patch b/patches/server/0930-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0931-Add-EntityFertilizeEggEvent.patch rename to patches/server/0930-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0936-Fix-text-display-error-on-spawn.patch b/patches/server/0935-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0936-Fix-text-display-error-on-spawn.patch rename to patches/server/0935-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0938-Add-Shearable-API.patch b/patches/server/0937-Add-Shearable-API.patch similarity index 100% rename from patches/server/0938-Add-Shearable-API.patch rename to patches/server/0937-Add-Shearable-API.patch diff --git a/patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/0941-Optimize-Hoppers.patch b/patches/server/0940-Optimize-Hoppers.patch similarity index 99% rename from patches/server/0941-Optimize-Hoppers.patch rename to patches/server/0940-Optimize-Hoppers.patch index 6265c6bf6a..1d70f3b9b5 100644 --- a/patches/server/0941-Optimize-Hoppers.patch +++ b/patches/server/0940-Optimize-Hoppers.patch @@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c5f3dc74888919e82e2ffbb8d648b7640aa6b690..80cf4852e4010eeeadaf920ab927a40df0179b40 100644 +index 365bcfcf667ffa76253b1db5cd06a96e0f3679d5..ae9b78c4e321eb811ee87e1827d3684371977609 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1522,6 +1522,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { serialized.gameMode = GameType.byId(buf.readVarInt()); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 82a63452e73ac146d2a8d9bfdd030d6aa4d42080..4e0bef1456cbeee6574b7581576cbb882878722e 100644 +index 4b8a1dd566601059f77b61b8df0c6ba8d211fed3..3876bcddb3ab69aee1feb0fe19cb343e097a6824 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -298,6 +298,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0946-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0946-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0948-Use-array-for-gamerule-storage.patch b/patches/server/0947-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0948-Use-array-for-gamerule-storage.patch rename to patches/server/0947-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0948-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0948-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0949-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0949-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0951-Add-Mob-Experience-reward-API.patch b/patches/server/0950-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0951-Add-Mob-Experience-reward-API.patch rename to patches/server/0950-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0951-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0951-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0952-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0952-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0953-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0953-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0955-More-accurate-isInOpenWater-impl.patch b/patches/server/0954-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0955-More-accurate-isInOpenWater-impl.patch rename to patches/server/0954-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0955-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0955-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0956-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0956-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0957-Fix-destroying-beehive-without-any-players-nearby-th.patch similarity index 100% rename from patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch rename to patches/server/0957-Fix-destroying-beehive-without-any-players-nearby-th.patch diff --git a/patches/server/0959-Expand-PlayerItemMendEvent.patch b/patches/server/0958-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0959-Expand-PlayerItemMendEvent.patch rename to patches/server/0958-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0959-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0959-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0961-Add-transient-modifier-API.patch b/patches/server/0960-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0961-Add-transient-modifier-API.patch rename to patches/server/0960-Add-transient-modifier-API.patch diff --git a/patches/server/0962-Fix-block-place-logic.patch b/patches/server/0961-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0962-Fix-block-place-logic.patch rename to patches/server/0961-Fix-block-place-logic.patch diff --git a/patches/server/0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0962-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0962-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0964-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0963-Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/server/0964-Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/0963-Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/server/0965-Call-BlockGrowEvent-for-the-pitcher-crop.patch b/patches/server/0964-Call-BlockGrowEvent-for-the-pitcher-crop.patch similarity index 100% rename from patches/server/0965-Call-BlockGrowEvent-for-the-pitcher-crop.patch rename to patches/server/0964-Call-BlockGrowEvent-for-the-pitcher-crop.patch diff --git a/patches/server/0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0965-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0965-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0967-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0966-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0967-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0966-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0968-Fix-sniffer-removeExploredLocation.patch b/patches/server/0967-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0968-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0967-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0968-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0968-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0969-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 100% rename from patches/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/0969-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch diff --git a/patches/server/0971-Folia-scheduler-and-owned-region-API.patch b/patches/server/0970-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/server/0971-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0970-Folia-scheduler-and-owned-region-API.patch index e8429bc2d4..ab71cbe00d 100644 --- a/patches/server/0971-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0970-Folia-scheduler-and-owned-region-API.patch @@ -1121,7 +1121,7 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 80cf4852e4010eeeadaf920ab927a40df0179b40..3238cbcba567b1242c77e41f6b6f19a8d157fb4e 100644 +index ae9b78c4e321eb811ee87e1827d3684371977609..435f5ee3388f5da93df938c43ea2578f7d586407 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1479,6 +1479,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop