diff --git a/gradle.properties b/gradle.properties index 797253a..2eae803 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=a751001ed1649860794a57ab818a5e51793aafe6 +paperRef=b4e3b3d1dd447bac4cbf478595c1ec320bc6dd4b org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0006-Gale-branding-changes.patch b/patches/server/0006-Gale-branding-changes.patch index 985e9c6..4f17ef8 100644 --- a/patches/server/0006-Gale-branding-changes.patch +++ b/patches/server/0006-Gale-branding-changes.patch @@ -427,10 +427,10 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..e45e6b44b2a8f2cdae6e0048a812b921 .completer(new ConsoleCommandCompleter(this.server)) .option(LineReader.Option.COMPLETE_IN_WORD, true); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 435f5ee3388f5da93df938c43ea2578f7d586407..28615e65ab1e0525d2cd4b0a0fca31e37eb8af0e 100644 +index 67ee3a4ca8a6cdeb275653d492a1fea8037c51fb..3f31b91ac6c9cb4d2b19536b6a6a2ab0f1b0df20 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -921,7 +921,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLooppatch version is incremented for small changes that do not affect the goal of any feature, + * such as bug fixes, performance improvements or changes in wording. + */ -+ public static final @NotNull String version = "0.6.3"; ++ public static final @NotNull String version = "0.6.4"; + + /** + * The "major.minor" portion of the {@link #version}. diff --git a/patches/server/0009-Gale-configuration.patch b/patches/server/0009-Gale-configuration.patch index e8034cb..2e60a82 100644 --- a/patches/server/0009-Gale-configuration.patch +++ b/patches/server/0009-Gale-configuration.patch @@ -218,7 +218,7 @@ index e471960e0443392f6f54732b052a4debf2a8fd97..c56b9264d83ae98a4cc0945ea1bd919e + // Gale end - Gale configuration } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 28615e65ab1e0525d2cd4b0a0fca31e37eb8af0e..d645fda67b00aca90091f419226010ee5ff527dd 100644 +index 3f31b91ac6c9cb4d2b19536b6a6a2ab0f1b0df20..15d60a311c44a66c0ff2fdff989f93c27be64c40 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -3,9 +3,6 @@ package net.minecraft.server; @@ -257,7 +257,7 @@ index 28615e65ab1e0525d2cd4b0a0fca31e37eb8af0e..d645fda67b00aca90091f419226010ee import org.slf4j.Logger; // CraftBukkit start -@@ -306,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.tickCount % autosavePeriod == 0; try { this.isSaving = true; -@@ -1423,7 +1384,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper @@ -230,7 +230,7 @@ index ac5028d2682889759cf89a49cf748c1841640d23..157e90f91b7461832ad628d07c3455fa try { worldserver.timings.doTick.startTiming(); // Spigot worldserver.tick(shouldKeepTicking); -@@ -1582,17 +1531,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop. diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java -index 7f174bb89bf4d700a5ae1b65d8abd4f5b1e7b5ed..7420f51ad52d233330fc9313fc08611917876788 100644 +index 2e60bdc44c33d434bfd9ca5bf8f75de799c6768c..13e69770acdbccd4d1155e279f937837cec4a108 100644 --- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java +++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java -@@ -27,8 +27,15 @@ public class ShapelessRecipe implements CraftingRecipe { +@@ -27,8 +27,15 @@ public class ShapelessRecipe extends io.papermc.paper.inventory.recipe.RecipeBoo final CraftingBookCategory category; final ItemStack result; final NonNullList ingredients; @@ -56,7 +56,7 @@ index 7f174bb89bf4d700a5ae1b65d8abd4f5b1e7b5ed..7420f51ad52d233330fc9313fc086119 this.id = id; this.group = group; this.category = category; -@@ -82,6 +89,28 @@ public class ShapelessRecipe implements CraftingRecipe { +@@ -83,6 +90,28 @@ public class ShapelessRecipe extends io.papermc.paper.inventory.recipe.RecipeBoo } public boolean matches(CraftingContainer inventory, Level world) { @@ -83,8 +83,8 @@ index 7f174bb89bf4d700a5ae1b65d8abd4f5b1e7b5ed..7420f51ad52d233330fc9313fc086119 + // Gale end - Airplane - simpler ShapelessRecipe comparison for vanilla + StackedContents autorecipestackmanager = new StackedContents(); + autorecipestackmanager.initialize(this); // Paper - better exact choice recipes int i = 0; - diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java index f7ea77dd82d978ad307f99c743efacfb34478b3d..965c38b2539258f12b06ab21d248ee09e266bb1d 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java diff --git a/patches/server/0051-Dragon-respawn-end-crystal-proximity-check.patch b/patches/server/0051-Dragon-respawn-end-crystal-proximity-check.patch deleted file mode 100644 index 103ac11..0000000 --- a/patches/server/0051-Dragon-respawn-end-crystal-proximity-check.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Martijn Muijsers -Date: Mon, 7 Aug 2023 22:02:38 +0200 -Subject: [PATCH] Dragon respawn end crystal proximity check - -License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) -Gale - https://galemc.org - -diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java -index ca1edc083847b47bb450b291723aca778a5912dc..428eed6ad35b59bdf293ca727fa3e81520a8bf0b 100644 ---- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java -+++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java -@@ -56,7 +56,7 @@ public class EndCrystalItem extends Item { - EndDragonFight enderdragonbattle = ((ServerLevel) world).getDragonFight(); - - if (enderdragonbattle != null) { -- enderdragonbattle.tryRespawn(); -+ enderdragonbattle.tryRespawn(blockposition1); // Gale - check placed end crystal to portal proximity before attempting to respawn dragon - } - } - -diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java -index 630971d7a87c12798672af9635535eaf80a3ec9c..060473abbeb9e0cae97e0c48cd480a300970ffa6 100644 ---- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java -+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java -@@ -553,6 +553,12 @@ public class EndDragonFight { - } - - public boolean tryRespawn() { // CraftBukkit - return boolean -+ // Gale start - check placed end crystal to portal proximity before attempting to respawn dragon -+ return this.tryRespawn(null); -+ } -+ -+ public boolean tryRespawn(@Nullable BlockPos placedEndCrystalBlockPos) { // CraftBukkit - return boolean -+ // Gale end - check placed end crystal to portal proximity before attempting to respawn dragon - if (this.dragonKilled && this.respawnStage == null) { - BlockPos blockposition = this.portalLocation; - -@@ -570,6 +576,22 @@ public class EndDragonFight { - blockposition = this.portalLocation; - } - -+ // Gale start - check placed end crystal to portal proximity before attempting to respawn dragon -+ if (placedEndCrystalBlockPos != null) { -+ // The end crystal must be 0 or 1 higher than the portal origin -+ int dy = placedEndCrystalBlockPos.getY() - blockposition.getY(); -+ if (dy != 0 && dy != 1) { -+ return false; -+ } -+ // The end crystal must be within a distance of 1 in one planar direction, and 3 in the other -+ int dx = placedEndCrystalBlockPos.getX() - blockposition.getX(); -+ int dz = placedEndCrystalBlockPos.getZ() - blockposition.getZ(); -+ if (!((dx >= -1 && dx <= 1 && dz >= -3 && dz <= 3) || (dx >= -3 && dx <= 3 && dz >= -1 && dz <= 1))) { -+ return false; -+ } -+ } -+ // Gale end - check placed end crystal to portal proximity before attempting to respawn dragon -+ - List list = Lists.newArrayList(); - BlockPos blockposition1 = blockposition.above(1); - Iterator iterator = Direction.Plane.HORIZONTAL.iterator(); diff --git a/patches/server/0052-Make-ender-dragon-respawn-attempt-after-placing-end-.patch b/patches/server/0051-Make-ender-dragon-respawn-attempt-after-placing-end-.patch similarity index 92% rename from patches/server/0052-Make-ender-dragon-respawn-attempt-after-placing-end-.patch rename to patches/server/0051-Make-ender-dragon-respawn-attempt-after-placing-end-.patch index fc908c7..de2a2f4 100644 --- a/patches/server/0052-Make-ender-dragon-respawn-attempt-after-placing-end-.patch +++ b/patches/server/0051-Make-ender-dragon-respawn-attempt-after-placing-end-.patch @@ -26,7 +26,7 @@ search to attempt respawning the ender dragon whenever a player places an end crystal. diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java -index 428eed6ad35b59bdf293ca727fa3e81520a8bf0b..0ebfa82de86cc08aa9f865e7807552bba4d3dd21 100644 +index 5a19875cbc603acea95193d969d2e1dc1e0bfd78..702f9ad3d7a27060bf3328192a32ea2807fbaa3b 100644 --- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java +++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java @@ -53,11 +53,13 @@ public class EndCrystalItem extends Item { @@ -37,7 +37,7 @@ index 428eed6ad35b59bdf293ca727fa3e81520a8bf0b..0ebfa82de86cc08aa9f865e7807552bb EndDragonFight enderdragonbattle = ((ServerLevel) world).getDragonFight(); if (enderdragonbattle != null) { - enderdragonbattle.tryRespawn(blockposition1); // Gale - check placed end crystal to portal proximity before attempting to respawn dragon + enderdragonbattle.tryRespawn(aboveBlockPosition); // Paper - pass placed end crystal position to pre-check proximity to portal } + } // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable } diff --git a/patches/server/0053-Make-saving-fireworks-configurable.patch b/patches/server/0052-Make-saving-fireworks-configurable.patch similarity index 100% rename from patches/server/0053-Make-saving-fireworks-configurable.patch rename to patches/server/0052-Make-saving-fireworks-configurable.patch diff --git a/patches/server/0054-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0053-Don-t-trigger-lootable-refresh-for-non-player-intera.patch similarity index 100% rename from patches/server/0054-Don-t-trigger-lootable-refresh-for-non-player-intera.patch rename to patches/server/0053-Don-t-trigger-lootable-refresh-for-non-player-intera.patch diff --git a/patches/server/0055-Reduce-hopper-item-checks.patch b/patches/server/0054-Reduce-hopper-item-checks.patch similarity index 100% rename from patches/server/0055-Reduce-hopper-item-checks.patch rename to patches/server/0054-Reduce-hopper-item-checks.patch diff --git a/patches/server/0056-Reduce-villager-item-re-pickup.patch b/patches/server/0055-Reduce-villager-item-re-pickup.patch similarity index 100% rename from patches/server/0056-Reduce-villager-item-re-pickup.patch rename to patches/server/0055-Reduce-villager-item-re-pickup.patch diff --git a/patches/server/0057-Variable-entity-wake-up-duration.patch b/patches/server/0056-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0057-Variable-entity-wake-up-duration.patch rename to patches/server/0056-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0058-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0057-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 97% rename from patches/server/0058-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/server/0057-Do-not-process-chat-commands-before-player-has-joine.patch index fda599c..c2693c9 100644 --- a/patches/server/0058-Do-not-process-chat-commands-before-player-has-joine.patch +++ b/patches/server/0057-Do-not-process-chat-commands-before-player-has-joine.patch @@ -13,7 +13,7 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2622ee60f839f2af896fbf5d974005518247a5f5..52f6a56f9290fa0fb6537842c9fefe4521cc5859 100644 +index e4f35f91a1b1b4c42c09602c19129fe4761ac4f8..e00fa5dfc9e74bcd784fe95a7430c59d3b00c937 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -271,6 +271,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0059-Do-not-log-invalid-statistics.patch b/patches/server/0058-Do-not-log-invalid-statistics.patch similarity index 100% rename from patches/server/0059-Do-not-log-invalid-statistics.patch rename to patches/server/0058-Do-not-log-invalid-statistics.patch diff --git a/patches/server/0060-Do-not-log-empty-message-warnings.patch b/patches/server/0059-Do-not-log-empty-message-warnings.patch similarity index 100% rename from patches/server/0060-Do-not-log-empty-message-warnings.patch rename to patches/server/0059-Do-not-log-empty-message-warnings.patch diff --git a/patches/server/0061-Do-not-log-ignored-advancements.patch b/patches/server/0060-Do-not-log-ignored-advancements.patch similarity index 100% rename from patches/server/0061-Do-not-log-ignored-advancements.patch rename to patches/server/0060-Do-not-log-ignored-advancements.patch diff --git a/patches/server/0062-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0061-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from patches/server/0062-Do-not-log-setBlock-in-far-chunks.patch rename to patches/server/0061-Do-not-log-setBlock-in-far-chunks.patch diff --git a/patches/server/0063-Do-not-log-unrecognized-recipes.patch b/patches/server/0062-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from patches/server/0063-Do-not-log-unrecognized-recipes.patch rename to patches/server/0062-Do-not-log-unrecognized-recipes.patch diff --git a/patches/server/0064-Do-not-log-legacy-Material-initialization.patch b/patches/server/0063-Do-not-log-legacy-Material-initialization.patch similarity index 100% rename from patches/server/0064-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0063-Do-not-log-legacy-Material-initialization.patch diff --git a/patches/server/0065-Do-not-log-plugin-library-loads.patch b/patches/server/0064-Do-not-log-plugin-library-loads.patch similarity index 100% rename from patches/server/0065-Do-not-log-plugin-library-loads.patch rename to patches/server/0064-Do-not-log-plugin-library-loads.patch diff --git a/patches/server/0066-Do-not-log-expired-message-warnings.patch b/patches/server/0065-Do-not-log-expired-message-warnings.patch similarity index 100% rename from patches/server/0066-Do-not-log-expired-message-warnings.patch rename to patches/server/0065-Do-not-log-expired-message-warnings.patch diff --git a/patches/server/0067-Do-not-log-out-of-order-message-warnings.patch b/patches/server/0066-Do-not-log-out-of-order-message-warnings.patch similarity index 100% rename from patches/server/0067-Do-not-log-out-of-order-message-warnings.patch rename to patches/server/0066-Do-not-log-out-of-order-message-warnings.patch diff --git a/patches/server/0068-Do-not-log-Not-Secure-marker.patch b/patches/server/0067-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from patches/server/0068-Do-not-log-Not-Secure-marker.patch rename to patches/server/0067-Do-not-log-Not-Secure-marker.patch diff --git a/patches/server/0069-Do-not-log-disconnections-with-null-id.patch b/patches/server/0068-Do-not-log-disconnections-with-null-id.patch similarity index 100% rename from patches/server/0069-Do-not-log-disconnections-with-null-id.patch rename to patches/server/0068-Do-not-log-disconnections-with-null-id.patch diff --git a/patches/server/0070-Do-not-log-run-as-root-warning.patch b/patches/server/0069-Do-not-log-run-as-root-warning.patch similarity index 96% rename from patches/server/0070-Do-not-log-run-as-root-warning.patch rename to patches/server/0069-Do-not-log-run-as-root-warning.patch index 98ccf3e..372ea23 100644 --- a/patches/server/0070-Do-not-log-run-as-root-warning.patch +++ b/patches/server/0069-Do-not-log-run-as-root-warning.patch @@ -41,7 +41,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 13d9fc5f4e6316b3fd6ef5ab50f78c7117e2df3a..16a9a9be54d5d763195b6f97eb2f09def2255483 100644 +index aba9c02f74bc0a1270d90a17db74f64dadb99f92..617b27eb8c42986dfb564decb30ad181527f1377 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -179,7 +179,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0071-Do-not-log-offline-mode-warning.patch b/patches/server/0070-Do-not-log-offline-mode-warning.patch similarity index 96% rename from patches/server/0071-Do-not-log-offline-mode-warning.patch rename to patches/server/0070-Do-not-log-offline-mode-warning.patch index b9b2e8d..0f68f68 100644 --- a/patches/server/0071-Do-not-log-offline-mode-warning.patch +++ b/patches/server/0070-Do-not-log-offline-mode-warning.patch @@ -41,7 +41,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 16a9a9be54d5d763195b6f97eb2f09def2255483..fcf8fe61e1c1cff550f86b83fca095a5513aa093 100644 +index 617b27eb8c42986dfb564decb30ad181527f1377..73a492e629677b045914cf41b826ee1acb4497b7 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -290,7 +290,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0072-Softly-log-invalid-pool-element-errors.patch b/patches/server/0071-Softly-log-invalid-pool-element-errors.patch similarity index 100% rename from patches/server/0072-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0071-Softly-log-invalid-pool-element-errors.patch diff --git a/patches/server/0073-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0072-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0073-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0072-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0074-Make-sand-duping-fix-configurable.patch b/patches/server/0073-Make-sand-duping-fix-configurable.patch similarity index 100% rename from patches/server/0074-Make-sand-duping-fix-configurable.patch rename to patches/server/0073-Make-sand-duping-fix-configurable.patch diff --git a/patches/server/0075-Make-tripwire-duping-fix-configurable.patch b/patches/server/0074-Make-tripwire-duping-fix-configurable.patch similarity index 100% rename from patches/server/0075-Make-tripwire-duping-fix-configurable.patch rename to patches/server/0074-Make-tripwire-duping-fix-configurable.patch diff --git a/patches/server/0076-Fix-MC-238526.patch b/patches/server/0075-Fix-MC-238526.patch similarity index 100% rename from patches/server/0076-Fix-MC-238526.patch rename to patches/server/0075-Fix-MC-238526.patch diff --git a/patches/server/0077-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0076-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0077-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0076-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0078-Fix-MC-121706.patch b/patches/server/0077-Fix-MC-121706.patch similarity index 100% rename from patches/server/0078-Fix-MC-121706.patch rename to patches/server/0077-Fix-MC-121706.patch diff --git a/patches/server/0079-Fix-MC-110386.patch b/patches/server/0078-Fix-MC-110386.patch similarity index 100% rename from patches/server/0079-Fix-MC-110386.patch rename to patches/server/0078-Fix-MC-110386.patch diff --git a/patches/server/0080-Fix-MC-31819.patch b/patches/server/0079-Fix-MC-31819.patch similarity index 100% rename from patches/server/0080-Fix-MC-31819.patch rename to patches/server/0079-Fix-MC-31819.patch diff --git a/patches/server/0081-Fix-MC-26304.patch b/patches/server/0080-Fix-MC-26304.patch similarity index 100% rename from patches/server/0081-Fix-MC-26304.patch rename to patches/server/0080-Fix-MC-26304.patch diff --git a/patches/server/0082-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0081-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0082-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0081-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0083-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0082-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 100% rename from patches/server/0083-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0082-Make-arrow-movement-resetting-despawn-counter-config.patch diff --git a/patches/server/0084-Make-logging-login-locations-configurable.patch b/patches/server/0083-Make-logging-login-locations-configurable.patch similarity index 100% rename from patches/server/0084-Make-logging-login-locations-configurable.patch rename to patches/server/0083-Make-logging-login-locations-configurable.patch diff --git a/patches/server/0085-Reduce-array-allocations.patch b/patches/server/0084-Reduce-array-allocations.patch similarity index 99% rename from patches/server/0085-Reduce-array-allocations.patch rename to patches/server/0084-Reduce-array-allocations.patch index 4315c50..3588b7e 100644 --- a/patches/server/0085-Reduce-array-allocations.patch +++ b/patches/server/0084-Reduce-array-allocations.patch @@ -412,7 +412,7 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..f06cafd80d7c027ca97e50bcb45ad520 OptionSpec optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]); OptionSpec optionspec12 = optionparser.accepts("serverId").withRequiredArg(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 157e90f91b7461832ad628d07c3455fa8629d32a..4e6107114a23fd978e38c8a4b072057520285d36 100644 +index ad222cd8bf85d1dcdf3f5dd613fb821e5c52ee4e..203598a379f944f44ff38bdd2007387cc7bc3176 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -50,6 +50,8 @@ import java.util.stream.Collectors; @@ -759,7 +759,7 @@ index 879cc823d56625867eb73bb621db6a13f40ad81c..3d589c9698129ab2a09093425d0bb97c k = aenumitemslot.length; diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java -index 9c1285e31d947f92e0b00149e342e793898e0d7c..dccb73d1cf06da3e3180992ea6edce322f4316ee 100644 +index 6693dd51440da3f0fc338c4e2cb67d3222eed182..826c25c41b505d4258e055ddd4a54f61b91e1490 100644 --- a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java +++ b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java @@ -12,6 +12,8 @@ import java.util.Iterator; @@ -771,7 +771,7 @@ index 9c1285e31d947f92e0b00149e342e793898e0d7c..dccb73d1cf06da3e3180992ea6edce32 import net.minecraft.core.NonNullList; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; -@@ -262,7 +264,7 @@ public class ShapedRecipe implements CraftingRecipe { +@@ -263,7 +265,7 @@ public class ShapedRecipe extends io.papermc.paper.inventory.recipe.RecipeBookEx } if (pattern.length == l) { diff --git a/patches/server/0086-Optimize-sun-burn-tick.patch b/patches/server/0085-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0086-Optimize-sun-burn-tick.patch rename to patches/server/0085-Optimize-sun-burn-tick.patch diff --git a/patches/server/0087-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0086-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0087-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0086-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0088-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0087-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0088-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0087-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0089-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0088-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0089-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0088-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0090-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0089-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0090-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0089-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0091-Replace-class-map-with-optimized-collection.patch b/patches/server/0090-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0091-Replace-class-map-with-optimized-collection.patch rename to patches/server/0090-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0092-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0091-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0092-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0091-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0093-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0092-Replace-shape-full-block-cache-with-hashtable.patch similarity index 98% rename from patches/server/0093-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0092-Replace-shape-full-block-cache-with-hashtable.patch index 41139c0..917f221 100644 --- a/patches/server/0093-Replace-shape-full-block-cache-with-hashtable.patch +++ b/patches/server/0092-Replace-shape-full-block-cache-with-hashtable.patch @@ -82,7 +82,7 @@ index 0000000000000000000000000000000000000000..48c32b224095f606669a38f0e200505a + +} diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index 9522e646529f3d849471931b4b3c0d133e7fcfc5..c4cff3592a39e519fc62664a21d368d8cac55271 100644 +index fdd9c61b7248e92dbcbec91cd6fe4c6310bba237..9a4bb34cc29ad0c4391db94e638ee47ab53d5f3a 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -11,6 +11,8 @@ import java.util.List; diff --git a/patches/server/0094-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0093-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0094-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0093-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0095-Cache-BlockStatePairKey-hash.patch b/patches/server/0094-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0095-Cache-BlockStatePairKey-hash.patch rename to patches/server/0094-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0096-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0095-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0096-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0095-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0097-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0096-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0097-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0096-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0098-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0097-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0098-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0097-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0099-Check-frozen-ticks-before-landing-block.patch b/patches/server/0098-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0099-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0098-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0100-Faster-chunk-serialization.patch b/patches/server/0099-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0100-Faster-chunk-serialization.patch rename to patches/server/0099-Faster-chunk-serialization.patch diff --git a/patches/server/0101-Update-boss-bar-within-tick.patch b/patches/server/0100-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0101-Update-boss-bar-within-tick.patch rename to patches/server/0100-Update-boss-bar-within-tick.patch diff --git a/patches/server/0102-Cache-ominous-banner-item.patch b/patches/server/0101-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0102-Cache-ominous-banner-item.patch rename to patches/server/0101-Cache-ominous-banner-item.patch diff --git a/patches/server/0103-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0102-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0103-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0102-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0104-Cache-world-generator-sea-level.patch b/patches/server/0103-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0104-Cache-world-generator-sea-level.patch rename to patches/server/0103-Cache-world-generator-sea-level.patch diff --git a/patches/server/0105-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0104-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0105-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0104-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0106-Optimize-villager-data-storage.patch b/patches/server/0105-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0106-Optimize-villager-data-storage.patch rename to patches/server/0105-Optimize-villager-data-storage.patch diff --git a/patches/server/0107-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0106-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0107-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0106-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0108-Store-mob-counts-in-an-array.patch b/patches/server/0107-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0108-Store-mob-counts-in-an-array.patch rename to patches/server/0107-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0109-Use-linked-map-for-entity-trackers.patch b/patches/server/0108-Use-linked-map-for-entity-trackers.patch similarity index 95% rename from patches/server/0109-Use-linked-map-for-entity-trackers.patch rename to patches/server/0108-Use-linked-map-for-entity-trackers.patch index e338d66..2b4de0f 100644 --- a/patches/server/0109-Use-linked-map-for-entity-trackers.patch +++ b/patches/server/0108-Use-linked-map-for-entity-trackers.patch @@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index eb12a3c0aefb3d6a42f08439db1ca51e3db65241..767f27759c3372b80d65f00195fcb49e8215fdf4 100644 +index f375c8a3cdc88ee8d1a54fb4663d56d190a62faa..be0210aef3805237adb0142d3eb8b4a76a3270e5 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -14,6 +14,7 @@ import com.mojang.datafixers.util.Either; diff --git a/patches/server/0110-Optimize-noise-generation.patch b/patches/server/0109-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0110-Optimize-noise-generation.patch rename to patches/server/0109-Optimize-noise-generation.patch diff --git a/patches/server/0111-Optimize-sheep-offspring-color.patch b/patches/server/0110-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0111-Optimize-sheep-offspring-color.patch rename to patches/server/0110-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0112-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0111-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0112-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0111-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0113-Skip-cloning-advancement-criteria.patch b/patches/server/0112-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0113-Skip-cloning-advancement-criteria.patch rename to patches/server/0112-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0114-Reduce-block-destruction-packet-allocations.patch b/patches/server/0113-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0114-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0113-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0115-Spread-out-sending-all-player-info.patch b/patches/server/0114-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0115-Spread-out-sending-all-player-info.patch rename to patches/server/0114-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0116-Optimize-player-list-for-sending-player-info.patch b/patches/server/0115-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0116-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0115-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0117-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0116-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0117-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0116-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0118-Send-multiple-keep-alive-packets.patch b/patches/server/0117-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0118-Send-multiple-keep-alive-packets.patch rename to patches/server/0117-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0119-Make-slow-login-timeout-configurable.patch b/patches/server/0118-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0119-Make-slow-login-timeout-configurable.patch rename to patches/server/0118-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0120-Make-max-interaction-distance-configurable.patch b/patches/server/0119-Make-max-interaction-distance-configurable.patch similarity index 100% rename from patches/server/0120-Make-max-interaction-distance-configurable.patch rename to patches/server/0119-Make-max-interaction-distance-configurable.patch diff --git a/patches/server/0121-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0120-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 100% rename from patches/server/0121-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0120-Load-portal-destination-chunk-before-entity-teleport.patch diff --git a/patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0121-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0121-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0122-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0122-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0123-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 95% rename from patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0123-Broadcast-crit-animations-as-the-entity-being-critte.patch index 0c2f4ba..c9f379a 100644 --- a/patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/patches/server/0123-Broadcast-crit-animations-as-the-entity-being-critte.patch @@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 52f6a56f9290fa0fb6537842c9fefe4521cc5859..df640e94bf51cfa62ccd28e32c0adc1c76ec07a6 100644 +index e00fa5dfc9e74bcd784fe95a7430c59d3b00c937..3049e4c011df8cb620d3fa981882be697f67e4ce 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1909,12 +1909,18 @@ public class ServerPlayer extends Player { +@@ -1914,12 +1914,18 @@ public class ServerPlayer extends Player { @Override public void crit(Entity target) { diff --git a/patches/server/0125-Ignore-null-legacy-structure-data.patch b/patches/server/0124-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0125-Ignore-null-legacy-structure-data.patch rename to patches/server/0124-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0126-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0125-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0126-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0125-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0127-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0126-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0127-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0126-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0128-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0127-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 95% rename from patches/server/0128-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0127-Do-not-place-player-in-world-if-kicked-before-being-.patch index e7a283b..f5ec65b 100644 --- a/patches/server/0128-Do-not-place-player-in-world-if-kicked-before-being-.patch +++ b/patches/server/0127-Do-not-place-player-in-world-if-kicked-before-being-.patch @@ -14,7 +14,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index ed7ecc89a5b0ebd24c677adb93e512b29d2cb5b5..016640e983367174603957049fc3d4d205e05103 100644 +index 814a3db7c5e1fe6a2b679a03483c98eefa493862..382e2c990dbc5e278c48e93965f0b54c0a23b8e6 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -269,6 +269,13 @@ public abstract class PlayerList { diff --git a/patches/server/0129-CraftBukkit-UUID-to-world-map.patch b/patches/server/0128-CraftBukkit-UUID-to-world-map.patch similarity index 97% rename from patches/server/0129-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0128-CraftBukkit-UUID-to-world-map.patch index 69a5613..0ff517d 100644 --- a/patches/server/0129-CraftBukkit-UUID-to-world-map.patch +++ b/patches/server/0128-CraftBukkit-UUID-to-world-map.patch @@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 97226a1135e9228ec010110b5d24fae00a49996a..9855ce266ef6d8fb75376160f353fa21db784a97 100644 +index 6d1baf7592a0d016b7d9a842ecc8660c42059490..d8e34ad5c2e79a0a766dd1cd33b9f7328b0ef563 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -44,6 +44,9 @@ import java.util.logging.Level; diff --git a/patches/server/0130-Global-EULA-file.patch b/patches/server/0129-Global-EULA-file.patch similarity index 100% rename from patches/server/0130-Global-EULA-file.patch rename to patches/server/0129-Global-EULA-file.patch diff --git a/patches/server/0131-Specific-interval-TPS-API.patch b/patches/server/0130-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0131-Specific-interval-TPS-API.patch rename to patches/server/0130-Specific-interval-TPS-API.patch diff --git a/patches/server/0132-5-second-TPS-average.patch b/patches/server/0131-5-second-TPS-average.patch similarity index 97% rename from patches/server/0132-5-second-TPS-average.patch rename to patches/server/0131-5-second-TPS-average.patch index 1793a05..c3bc391 100644 --- a/patches/server/0132-5-second-TPS-average.patch +++ b/patches/server/0131-5-second-TPS-average.patch @@ -59,10 +59,10 @@ index fa56cd09102a89692b42f1d14257990508c5c720..fac07dda413002c12276131efbe4ee38 setListData(vector); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4e6107114a23fd978e38c8a4b072057520285d36..dad215d8eae5171b20b0e4417bed3b8f9aedd698 100644 +index 203598a379f944f44ff38bdd2007387cc7bc3176..350d503d7f03c63c0e3e2155a75035b96320f5fc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1027,6 +1027,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop