From a485bc9b5e18861c5a0f87fcc9f895c613f1333a Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Sat, 25 May 2024 17:30:25 +0800 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/api/0001-Leaves-Server-Config.patch | 2 +- patches/api/0003-Add-fakeplayer-api.patch | 8 ++-- patches/api/0009-Replay-Mod-API.patch | 8 ++-- patches/api/0010-Bytebuf-API.patch | 8 ++-- patches/server/0001-Build-changes.patch | 6 +-- patches/server/0003-Delete-Timings.patch | 34 ++++++++--------- patches/server/0004-Leaves-Server-Utils.patch | 4 +- .../0005-Update-version-fetcher-repo.patch | 4 +- ...006-Leaves-Server-Config-And-Command.patch | 8 ++-- .../server/0007-Leaves-Protocol-Core.patch | 6 +-- .../server/0008-Fix-gravity-block-duper.patch | 4 +- patches/server/0011-Fakeplayer-support.patch | 14 +++---- ...Add-isShrink-to-EntityResurrectEvent.patch | 2 +- .../0021-Optimize-entity-coordinate-key.patch | 2 +- .../server/0022-Optimize-suffocation.patch | 2 +- ...ve-ThreadUnsafeRandom-Initialization.patch | 6 +-- ...28-Config-to-disable-method-profiler.patch | 8 ++-- ...oal-selector-during-inactive-ticking.patch | 2 +- ...-Cache-climbing-check-for-activation.patch | 2 +- ...ce-entity-fluid-lookups-if-no-fluids.patch | 6 +-- ...040-InstantBlockUpdater-Reintroduced.patch | 4 +- .../0044-Player-operation-limiter.patch | 4 +- .../0048-MC-Technical-Survival-Mode.patch | 2 +- .../0049-Return-nether-portal-fix.patch | 4 +- .../0052-Leaves-Extra-Yggdrasil-Service.patch | 4 +- .../0053-Use-vanilla-random-config.patch | 2 +- .../0054-Fix-update-suppression-crash.patch | 4 +- patches/server/0055-Bedrock-break-list.patch | 4 +- .../server/0065-Creative-fly-no-clip.patch | 2 +- ...070-Elytra-aeronautics-no-chunk-load.patch | 4 +- .../0089-Reduce-array-allocations.patch | 12 +++--- .../server/0090-Optimize-sun-burn-tick.patch | 4 +- ...ck-frozen-ticks-before-landing-block.patch | 2 +- ...Skip-entity-move-if-movement-is-zero.patch | 4 +- ...gible-planar-movement-multiplication.patch | 2 +- patches/server/0105-Replay-Mod-API.patch | 10 ++--- .../0123-Linear-region-file-format.patch | 38 +++++++++---------- ...ked-hopper-no-longer-send-NC-updates.patch | 4 +- patches/server/0130-Fast-resume.patch | 6 +-- ...3-Fix-falling-block-s-block-location.patch | 4 +- patches/server/0135-Bytebuf-API.patch | 6 +-- 42 files changed, 132 insertions(+), 132 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4067f439..40cf5486 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,6 @@ version=1.20.6-R0.1-SNAPSHOT mcVersion=1.20.6 org.gradle.jvmargs=-Xmx2G -paperRef=f17519338bc589c045e0b32bfc37e048b23544d5 +paperRef=377733d44c0f1d476cada93ebae2478a1c495b23 preVersion=true updatingMinecraft=true \ No newline at end of file diff --git a/patches/api/0001-Leaves-Server-Config.patch b/patches/api/0001-Leaves-Server-Config.patch index 4f703330..84e7c96b 100644 --- a/patches/api/0001-Leaves-Server-Config.patch +++ b/patches/api/0001-Leaves-Server-Config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Server Config diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c8595ffcfcbdd79794d464415287d46acef72b72..99d754d3d06accbe13363f729b284e0eab67f2aa 100644 +index 49d2547fcdaf779e284f513e58c1ac2ae3000bda..28ae66ae562dc7ab999908fe2a01a083a8d3de2b 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -2256,6 +2256,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0003-Add-fakeplayer-api.patch b/patches/api/0003-Add-fakeplayer-api.patch index 993d2863..2477a98e 100644 --- a/patches/api/0003-Add-fakeplayer-api.patch +++ b/patches/api/0003-Add-fakeplayer-api.patch @@ -14,10 +14,10 @@ index 97e78e27ee0eea2c8b24886eeb19164d552323fe..9764fa643039f215627c20a33ca70c9e /.factorypath + diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 71f1c361ebccbe83193c37ec3a90faa4085001c3..0bfaeca0b1e1fadfaeed486c94dac19447062575 100644 +index 9a219b255b63f10005fc68faacb771dd32f61ac2..6dcec4061e2bec84b23cc7e5fbd2927b1571b77e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2903,6 +2903,17 @@ public final class Bukkit { +@@ -2909,6 +2909,17 @@ public final class Bukkit { } // Paper end - Folia region threading API @@ -36,7 +36,7 @@ index 71f1c361ebccbe83193c37ec3a90faa4085001c3..0bfaeca0b1e1fadfaeed486c94dac194 public static Server.Spigot spigot() { return server.spigot(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 99d754d3d06accbe13363f729b284e0eab67f2aa..5e60df867b3111c203c0fe249b09e8c6333d1255 100644 +index 28ae66ae562dc7ab999908fe2a01a083a8d3de2b..f549901dfde495282390479337a1d13b62461295 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -61,6 +61,7 @@ import org.bukkit.util.CachedServerIcon; @@ -47,7 +47,7 @@ index 99d754d3d06accbe13363f729b284e0eab67f2aa..5e60df867b3111c203c0fe249b09e8c6 /** * Represents a server implementation. -@@ -2550,4 +2551,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2554,4 +2555,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ boolean isOwnedByCurrentRegion(@NotNull Entity entity); // Paper end - Folia region threading API diff --git a/patches/api/0009-Replay-Mod-API.patch b/patches/api/0009-Replay-Mod-API.patch index b1c394fe..1d7e5295 100644 --- a/patches/api/0009-Replay-Mod-API.patch +++ b/patches/api/0009-Replay-Mod-API.patch @@ -14,10 +14,10 @@ index 9764fa643039f215627c20a33ca70c9e36b2d599..97e78e27ee0eea2c8b24886eeb19164d /.factorypath - diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 0bfaeca0b1e1fadfaeed486c94dac19447062575..3c2b252243c1fa0d3adcc9c860c24af73165de33 100644 +index 6dcec4061e2bec84b23cc7e5fbd2927b1571b77e..336b8d396f067cface060354c45e03c71ca35f27 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2913,6 +2913,11 @@ public final class Bukkit { +@@ -2919,6 +2919,11 @@ public final class Bukkit { return server.getBotManager(); } // Leaves end - Bot API @@ -30,7 +30,7 @@ index 0bfaeca0b1e1fadfaeed486c94dac19447062575..3c2b252243c1fa0d3adcc9c860c24af7 @NotNull public static Server.Spigot spigot() { diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 5e60df867b3111c203c0fe249b09e8c6333d1255..4a03044938630e4a0e701bc481f15da5a3323115 100644 +index f549901dfde495282390479337a1d13b62461295..9384d1d8015aeae910756f35fa27bdc16dfb5662 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -62,6 +62,7 @@ import org.jetbrains.annotations.Contract; @@ -41,7 +41,7 @@ index 5e60df867b3111c203c0fe249b09e8c6333d1255..4a03044938630e4a0e701bc481f15da5 /** * Represents a server implementation. -@@ -2560,4 +2561,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2564,4 +2565,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull BotManager getBotManager(); // Leaves end - Bot API diff --git a/patches/api/0010-Bytebuf-API.patch b/patches/api/0010-Bytebuf-API.patch index d09af222..6a84160c 100644 --- a/patches/api/0010-Bytebuf-API.patch +++ b/patches/api/0010-Bytebuf-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Bytebuf API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 3c2b252243c1fa0d3adcc9c860c24af73165de33..1caffc8771680505be1c51a2f5050528435cdc33 100644 +index 336b8d396f067cface060354c45e03c71ca35f27..900156f8a6c749177de5fc305a76b8d77c23b90e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2919,6 +2919,12 @@ public final class Bukkit { +@@ -2925,6 +2925,12 @@ public final class Bukkit { } // Leaves end - Photographer API @@ -22,10 +22,10 @@ index 3c2b252243c1fa0d3adcc9c860c24af73165de33..1caffc8771680505be1c51a2f5050528 public static Server.Spigot spigot() { return server.spigot(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 4a03044938630e4a0e701bc481f15da5a3323115..7a006d2582cd91b83ab05aeb6d6a6f96b77d2dbc 100644 +index 9384d1d8015aeae910756f35fa27bdc16dfb5662..42cb311cbc6001e3116a4e2a0b4207d385995b2e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2564,4 +2564,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2568,4 +2568,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi // Leaves start - Photographer API @NotNull PhotographerManager getPhotographerManager(); // Leaves end - Photographer API diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 35ed3722..65c8e4c6 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -164,10 +164,10 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..c060857cb0551fff8f5033553b887f3a private static final String BUILD_DEV = "DEV"; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index dbc86b8d4d2af6e5f7e678f2bb77fd39b85c04c5..9719199b7dc98e5f04706bd420af5f14d8b9724c 100644 +index 0ed42fa899721f83b598db05be1b5f321af3614a..9cd75d163e81f812e8dcd3c010b4a715d2bcf804 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1168,7 +1168,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, CommandSource, AutoCloseable { private static MinecraftServer SERVER; // Paper -@@ -975,7 +970,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { entityplayer.connection.suspendFlushing(); }); @@ -1018,7 +1018,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d // Paper start - Folia scheduler API ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick(); getAllLevels().forEach(level -> { -@@ -1717,21 +1700,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop iterator = this.blockEntityTickers.iterator(); boolean flag = this.tickRateManager().runsNormally(); -@@ -1297,9 +1292,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1288,9 +1283,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075 @@ -1974,7 +1974,7 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 5a382907285a288f2a223189e690d3dbdf45594c..129aa57a01877c9339541f0e10933573bd438fe6 100644 +index e46714f38df931350d81c30907560c381c8d2725..37bc178f738b4d9cd7ff07cf27bad676bb28532e 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -219,7 +219,6 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0004-Leaves-Server-Utils.patch b/patches/server/0004-Leaves-Server-Utils.patch index c39a03c6..52d28dd0 100644 --- a/patches/server/0004-Leaves-Server-Utils.patch +++ b/patches/server/0004-Leaves-Server-Utils.patch @@ -31,7 +31,7 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279 public PlayerAreaMap() { super(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2bc85351e6e52f90da5fdb29d8d042a06132d742..1d8be1e7b71db074b7616d0a5e0c5075f09877ac 100644 +index 25ea45a528612d1a2a2d77293b3802f473a52f38..5d14db0ee37c2705630776bd135bbc1e0d150905 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -426,6 +426,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -62,7 +62,7 @@ index 2bc85351e6e52f90da5fdb29d8d042a06132d742..1d8be1e7b71db074b7616d0a5e0c5075 } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT"); -@@ -4995,4 +5002,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -5001,4 +5008,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this); } // Paper end - Expose entity id counter diff --git a/patches/server/0005-Update-version-fetcher-repo.patch b/patches/server/0005-Update-version-fetcher-repo.patch index 13aee92a..4ee937d9 100644 --- a/patches/server/0005-Update-version-fetcher-repo.patch +++ b/patches/server/0005-Update-version-fetcher-repo.patch @@ -27,10 +27,10 @@ index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..917ffaae401f3374d07d7fb7c024234a if (data == null) { return null; diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 129aa57a01877c9339541f0e10933573bd438fe6..99c7711447ac70fe4219fc55c3ba9fbd45924a90 100644 +index 37bc178f738b4d9cd7ff07cf27bad676bb28532e..ea71e11be59371682b421060edc8658421b56101 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -510,7 +510,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -501,7 +501,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { diff --git a/patches/server/0006-Leaves-Server-Config-And-Command.patch b/patches/server/0006-Leaves-Server-Config-And-Command.patch index 353b4a0e..432f39cb 100644 --- a/patches/server/0006-Leaves-Server-Config-And-Command.patch +++ b/patches/server/0006-Leaves-Server-Config-And-Command.patch @@ -24,10 +24,10 @@ index 16b742b5131376ceca04570dd4c088caff62e677..fe1f6f1a97ab35c44f596596d16765b8 description = "Spin up a test server from the Mojang mapped bundler jar" classpath(rootProject.tasks.named("createMojmapBundlerJar").flatMap { it.outputZip }) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 025e1a22d7344fc7de2baca5c29a6a6dacd2c88e..624c28d63aba34e9d4677c538b84bebbda7d706a 100644 +index 026dc226ace6b067df8987f10039d4c037c47124..421b67ab81330975f6404578ffcc57feb0c9c0be 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1150,6 +1150,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21)); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3fbf31ef07489ffb7d0c0f5317fa967db740494d..87bb3ecfbc1fc48a0c276261ea438ba43f8e9e50 100644 +index 5375536a1b752f4b2a41b5e9b02d418ffdaef4c4..a99b5ab363b1acffc4c5ce3151ea28ff2c377d8d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -305,6 +305,7 @@ public final class CraftServer implements Server { @@ -364,7 +364,7 @@ index 3fbf31ef07489ffb7d0c0f5317fa967db740494d..87bb3ecfbc1fc48a0c276261ea438ba4 // Paper start - Folia region threading API private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler(); -@@ -3275,4 +3276,11 @@ public final class CraftServer implements Server { +@@ -3267,4 +3268,11 @@ public final class CraftServer implements Server { return this.potionBrewer; } // Paper end diff --git a/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch b/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch index 707b93f6..aab3bbba 100644 --- a/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch +++ b/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e8a472f7e90dfb39b16521f75521d60b532af5cc..d106491e5ca187cf62758cbd33bab575ccbc3bec 100644 +index 13b4f4dd74a639856aa89e131f44d973e12c027c..b7fbb6b7fddee11ceffbce9c1f2de869176351be 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1648,12 +1648,12 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0021-Optimize-entity-coordinate-key.patch b/patches/server/0021-Optimize-entity-coordinate-key.patch index 2ee302d5..603e806a 100644 --- a/patches/server/0021-Optimize-entity-coordinate-key.patch +++ b/patches/server/0021-Optimize-entity-coordinate-key.patch @@ -25,7 +25,7 @@ index 1d6b3fe2ce240af4ede61588795456b046eee6c9..21847dfde06ded5944699ca30a4ec9c2 public static long getCoordinateKey(final ChunkPos pair) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 082b484df1bd3d6a87413e3ab9a07a8f5401c65d..e87a60ca43fe080209620e11833099e7ea9164b5 100644 +index 28d388d5955eeb322b9f47ba542a23ca2264ea8e..b4349e91a804c7998bb42f3a1e228f56ab2a5d0f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -312,7 +312,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0022-Optimize-suffocation.patch b/patches/server/0022-Optimize-suffocation.patch index d598c658..673e1cb7 100644 --- a/patches/server/0022-Optimize-suffocation.patch +++ b/patches/server/0022-Optimize-suffocation.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize suffocation This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d106491e5ca187cf62758cbd33bab575ccbc3bec..9755d85c090d336364f041d32f11ea7c5041945e 100644 +index b7fbb6b7fddee11ceffbce9c1f2de869176351be..407514daeb977d44d9f82dc5865cfd757f8ef40e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -426,7 +426,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0024-Move-ThreadUnsafeRandom-Initialization.patch b/patches/server/0024-Move-ThreadUnsafeRandom-Initialization.patch index 78639f7d..b2f24147 100644 --- a/patches/server/0024-Move-ThreadUnsafeRandom-Initialization.patch +++ b/patches/server/0024-Move-ThreadUnsafeRandom-Initialization.patch @@ -19,10 +19,10 @@ index c93d0fbb921309a63c21ba7775fdf44aaa7985c4..84472442e0e68c22c4ebeaaf980aee1e public void tickChunk(LevelChunk chunk, int randomTickSpeed) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 34654d0f7d5c159ceaf76b327a3f86bd4f82c175..d4854e404b111b0cb936539b4ce95890b22a6f9d 100644 +index 7231aaac1fe66301727502596f59f9af71cf0aa6..2f12ea930fb173b22d36dc159ee3730fb61f2f08 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -212,6 +212,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -203,6 +203,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public abstract ResourceKey getTypeKey(); @@ -31,7 +31,7 @@ index 34654d0f7d5c159ceaf76b327a3f86bd4f82c175..d4854e404b111b0cb936539b4ce95890 protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, RegistryAccess iregistrycustom, Holder holder, Supplier supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config -@@ -300,6 +302,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -291,6 +293,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { // Paper end - optimise collisions } diff --git a/patches/server/0028-Config-to-disable-method-profiler.patch b/patches/server/0028-Config-to-disable-method-profiler.patch index bd95715c..a27066f0 100644 --- a/patches/server/0028-Config-to-disable-method-profiler.patch +++ b/patches/server/0028-Config-to-disable-method-profiler.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d8ac4b133c52c46494518a93884f715108dc8f17..35a67136f5e22c5f9b65841fb7c10309e0b0e1c2 100644 +index 24362501292e61c5d1f17917f27095b6a56b661c..ee22bcbe2f64cac2d22328d9abb3c91c2263fb2e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2533,6 +2533,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop tag, double speed) { @@ -35,7 +35,7 @@ index e87a60ca43fe080209620e11833099e7ea9164b5..bf8e3d510631e418eb6d2e641b51a122 double d1 = 0.0D; boolean flag = this.isPushedByFluid(); boolean flag1 = false; -@@ -4504,38 +4506,123 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4510,38 +4512,123 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess int k1 = 0; BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(); diff --git a/patches/server/0040-InstantBlockUpdater-Reintroduced.patch b/patches/server/0040-InstantBlockUpdater-Reintroduced.patch index 91308a05..abe54ec7 100644 --- a/patches/server/0040-InstantBlockUpdater-Reintroduced.patch +++ b/patches/server/0040-InstantBlockUpdater-Reintroduced.patch @@ -6,7 +6,7 @@ Subject: [PATCH] InstantBlockUpdater Reintroduced This patch is Powered by Carpet-TIS-Addition(https://github.com/plusls/Carpet-TIS-Addition) diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 68d065ff98141176e0c4ed43ea4d7a3531fa62da..c04e07fa16d701d814a2df82758d4339e3b4e5f1 100644 +index fe8886afe34f978b34832b5b295c7fee8bef3c26..fc956d2d81f9b7625c7143810c77c8ab8e86ec5c 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -73,6 +73,7 @@ import net.minecraft.world.level.lighting.LevelLightEngine; @@ -17,7 +17,7 @@ index 68d065ff98141176e0c4ed43ea4d7a3531fa62da..c04e07fa16d701d814a2df82758d4339 import net.minecraft.world.level.redstone.NeighborUpdater; import net.minecraft.world.level.saveddata.maps.MapId; import net.minecraft.world.level.saveddata.maps.MapItemSavedData; -@@ -254,7 +255,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -245,7 +246,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { this.thread = Thread.currentThread(); this.biomeManager = new BiomeManager(this, i); this.isDebug = flag1; diff --git a/patches/server/0044-Player-operation-limiter.patch b/patches/server/0044-Player-operation-limiter.patch index 842dee35..138d0b47 100644 --- a/patches/server/0044-Player-operation-limiter.patch +++ b/patches/server/0044-Player-operation-limiter.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b1a32440f92f54ea86356391ecaa14c676f79eed..1c9c28436645737e8691d5e4dd9a757ab668e458 100644 +index 1adceb1122a3312d70482e01f9d3054b3b88ba5d..8fca15c38d3410b0db113b2a391fd1d3f5596aee 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -299,6 +299,10 @@ public class ServerPlayer extends Player { @@ -28,7 +28,7 @@ index b1a32440f92f54ea86356391ecaa14c676f79eed..1c9c28436645737e8691d5e4dd9a757a this.gameMode.tick(); this.wardenSpawnTracker.tick(); --this.spawnInvulnerableTime; -@@ -2876,5 +2881,32 @@ public class ServerPlayer extends Player { +@@ -2882,5 +2887,32 @@ public class ServerPlayer extends Player { public CraftPlayer getBukkitEntity() { return (CraftPlayer) super.getBukkitEntity(); } diff --git a/patches/server/0048-MC-Technical-Survival-Mode.patch b/patches/server/0048-MC-Technical-Survival-Mode.patch index e45558c4..c86202be 100644 --- a/patches/server/0048-MC-Technical-Survival-Mode.patch +++ b/patches/server/0048-MC-Technical-Survival-Mode.patch @@ -65,7 +65,7 @@ index 63652c3011c48c461c1b5be1889847b2f065e34c..0f3a92155fa0b4ed9d7fbc87202fd04d pearl.ownerUUID = null; } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 1c9c28436645737e8691d5e4dd9a757ab668e458..2945dc0d1ad1c50fded0d61e9dd582bbe20bbecd 100644 +index 8fca15c38d3410b0db113b2a391fd1d3f5596aee..a3c3e3848a2528aea1ff379b348cf07fb4e7c07b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1610,7 +1610,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0049-Return-nether-portal-fix.patch b/patches/server/0049-Return-nether-portal-fix.patch index 1894d742..9107a695 100644 --- a/patches/server/0049-Return-nether-portal-fix.patch +++ b/patches/server/0049-Return-nether-portal-fix.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2945dc0d1ad1c50fded0d61e9dd582bbe20bbecd..bab6ae23c77cb9dc575625720ac31ae67a28d5d9 100644 +index a3c3e3848a2528aea1ff379b348cf07fb4e7c07b..74667f23c21e983359c0630812a46d98934a13c9 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -19,6 +19,7 @@ import java.util.UUID; @@ -111,7 +111,7 @@ index 00809b615f65b2f4985856673430d8ba68525765..a65aede101004f23f76ce08781ab0a94 // Save player file again if they were disconnected diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8e5bfb7579b528d68b270665c02588bfa39643a3..3ad2f5234925e7f454d2b2bcb507493cdc3e454a 100644 +index 0bd50e9ced73d121a1856f910a807b470534a272..f1a989919f563b3f424d3ba7ebecb10ac56c4ecb 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -251,7 +251,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0052-Leaves-Extra-Yggdrasil-Service.patch b/patches/server/0052-Leaves-Extra-Yggdrasil-Service.patch index 611a13a4..d06b5c87 100644 --- a/patches/server/0052-Leaves-Extra-Yggdrasil-Service.patch +++ b/patches/server/0052-Leaves-Extra-Yggdrasil-Service.patch @@ -31,7 +31,7 @@ index bfc1e27c37689c1fbb927404a7176780a439a057..bc8ab50ef1390a2c51110a89dc43db58 private final String baseUrl; private final URL joinUrl; diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 5443013060b62e3bfcc51cddca96d1c0bc59fe72..66c2b5caa08ab1659a9412c4b21404e90d8360f1 100644 +index 244a19ecd0234fa1d7a6ecfea20751595688605d..7a1f7714616913cbb9d2dfc017567895e189ead1 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -190,7 +190,7 @@ public class Main { @@ -44,7 +44,7 @@ index 5443013060b62e3bfcc51cddca96d1c0bc59fe72..66c2b5caa08ab1659a9412c4b21404e9 String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName); LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath()); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 35a67136f5e22c5f9b65841fb7c10309e0b0e1c2..81e557588bf91bdd4654833ec967f2a727823d27 100644 +index ee22bcbe2f64cac2d22328d9abb3c91c2263fb2e..1b4be84963683481a375a44c14b275100cf43886 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -259,7 +259,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= i) { return (List) object; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 21b659382656f01d7576cd0481c831166f7f3229..5c03702896a837425dfa13fdd5db1056f9267a88 100644 +index b82b45f57cdd7a98f3c29cc6c80b4d8aedece681..5d290f9335a510f4ddab7a78a96c0d8eedd4682e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1662,7 +1662,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> progressMap = Reference2FloatMaps.synchronize(new Reference2FloatOpenHashMap()); volatile Component status = Component.translatable("optimizeWorld.stage.counting"); -- public static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.mca$"); -+ public static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.(linear | mca)$"); // Leaves +- static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.mca$"); ++ static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.(linear | mca)$"); // Leaves final DimensionDataStorage overworldDataStorage; public WorldUpgrader(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, RegistryAccess dynamicRegistryManager, boolean eraseCache, boolean recreateRegionFiles) { @@ -200,7 +200,7 @@ index 1362a47943cf1a51a185a15094b1f74c94bf40ef..5dc0631ee8122f1a8473b6b1cf890cb5 try (DataInputStream out = new DataInputStream(new java.io.BufferedInputStream(new InflaterInputStream(Files.newInputStream(file))))) { return NbtIo.read((java.io.DataInput) out); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7d8e0c779 100644 +index 1090b7e36e3c1c105bc36135b82751c651f237d4..d24ec065c76f6852586328dd56fba311cf8ac8a8 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java @@ -21,11 +21,15 @@ public class RegionFileStorage implements AutoCloseable { @@ -239,10 +239,10 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 return null; } -@@ -92,29 +100,29 @@ public class RegionFileStorage implements AutoCloseable { - } - } - +@@ -94,29 +102,29 @@ public class RegionFileStorage implements AutoCloseable { + // Paper end + + // Paper start - public synchronized RegionFile getRegionFileIfLoaded(ChunkPos chunkcoordintpair) { + public synchronized org.leavesmc.leaves.region.AbstractRegionFile getRegionFileIfLoaded(ChunkPos chunkcoordintpair) { // Leaves return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ())); @@ -275,7 +275,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 } // Paper end return regionfile; -@@ -125,28 +133,40 @@ public class RegionFileStorage implements AutoCloseable { +@@ -127,28 +135,40 @@ public class RegionFileStorage implements AutoCloseable { } // Paper end - cache regionfile does not exist state if (this.regionCache.size() >= io.papermc.paper.configuration.GlobalConfiguration.get().misc.regionFileCacheSize) { // Paper - Sanitise RegionFileCache and make configurable @@ -323,7 +323,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 } // Paper end return regionfile1; -@@ -158,7 +178,7 @@ public class RegionFileStorage implements AutoCloseable { +@@ -160,7 +180,7 @@ public class RegionFileStorage implements AutoCloseable { org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed."); } @@ -332,7 +332,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 synchronized (regionfile) { try (DataInputStream datainputstream = regionfile.getChunkDataInputStream(chunkCoordinate)) { CompoundTag oversizedData = regionfile.getOversizedData(chunkCoordinate.x, chunkCoordinate.z); -@@ -193,14 +213,14 @@ public class RegionFileStorage implements AutoCloseable { +@@ -195,14 +215,14 @@ public class RegionFileStorage implements AutoCloseable { @Nullable public CompoundTag read(ChunkPos pos) throws IOException { // CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing @@ -349,7 +349,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 // We add the regionfile parameter to avoid the potential deadlock (on fileLock) if we went back to obtain a regionfile // if we decide to re-read // Paper end -@@ -210,7 +230,7 @@ public class RegionFileStorage implements AutoCloseable { +@@ -212,7 +232,7 @@ public class RegionFileStorage implements AutoCloseable { // Paper start if (regionfile.isOversized(pos.x, pos.z)) { @@ -358,7 +358,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 return readOversizedChunk(regionfile, pos); } // Paper end -@@ -224,12 +244,12 @@ public class RegionFileStorage implements AutoCloseable { +@@ -226,12 +246,12 @@ public class RegionFileStorage implements AutoCloseable { if (this.isChunkData) { ChunkPos chunkPos = ChunkSerializer.getChunkCoordinate(nbttagcompound); if (!chunkPos.equals(pos)) { @@ -374,7 +374,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 return null; } } -@@ -263,13 +283,13 @@ public class RegionFileStorage implements AutoCloseable { +@@ -265,13 +285,13 @@ public class RegionFileStorage implements AutoCloseable { return nbttagcompound; } finally { // Paper start @@ -390,7 +390,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 if (regionfile == null) { return; } -@@ -300,7 +320,7 @@ public class RegionFileStorage implements AutoCloseable { +@@ -302,7 +322,7 @@ public class RegionFileStorage implements AutoCloseable { protected void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException { // Paper start - rewrite chunk system @@ -399,7 +399,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 if (nbt == null && regionfile == null) { return; } -@@ -315,8 +335,33 @@ public class RegionFileStorage implements AutoCloseable { +@@ -317,8 +337,33 @@ public class RegionFileStorage implements AutoCloseable { if (nbt == null) { regionfile.clear(pos); } else { @@ -434,7 +434,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 try { NbtIo.write(nbt, (DataOutput) dataoutputstream); regionfile.setStatus(pos.x, pos.z, ChunkSerializer.getStatus(nbt)); // Paper - Cache chunk status -@@ -355,7 +400,7 @@ public class RegionFileStorage implements AutoCloseable { +@@ -357,7 +402,7 @@ public class RegionFileStorage implements AutoCloseable { // Paper end - Chunk save reattempt // Paper start - rewrite chunk system } finally { @@ -443,7 +443,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 } // Paper end - rewrite chunk system } -@@ -365,7 +410,7 @@ public class RegionFileStorage implements AutoCloseable { +@@ -367,7 +412,7 @@ public class RegionFileStorage implements AutoCloseable { ObjectIterator objectiterator = this.regionCache.values().iterator(); while (objectiterator.hasNext()) { @@ -452,7 +452,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7 try { regionfile.close(); -@@ -381,7 +426,7 @@ public class RegionFileStorage implements AutoCloseable { +@@ -383,7 +428,7 @@ public class RegionFileStorage implements AutoCloseable { ObjectIterator objectiterator = this.regionCache.values().iterator(); while (objectiterator.hasNext()) { diff --git a/patches/server/0126-Placing-locked-hopper-no-longer-send-NC-updates.patch b/patches/server/0126-Placing-locked-hopper-no-longer-send-NC-updates.patch index 63aca758..00b5b380 100644 --- a/patches/server/0126-Placing-locked-hopper-no-longer-send-NC-updates.patch +++ b/patches/server/0126-Placing-locked-hopper-no-longer-send-NC-updates.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Placing locked hopper no longer send NC updates diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index fdf56caa8756f065f892847898f2b2b9af18f5c6..4da9144e2b6e711587b4f202953928d8a48199f5 100644 +index c7f740be91ecbf9cb3baa30ae02b5751454fc23d..811fc5ad978157bed9577a603b90868571c0fe2f 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -54,6 +54,7 @@ import net.minecraft.world.level.biome.BiomeManager; @@ -16,7 +16,7 @@ index fdf56caa8756f065f892847898f2b2b9af18f5c6..4da9144e2b6e711587b4f202953928d8 import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.TickingBlockEntity; import net.minecraft.world.level.block.state.BlockState; -@@ -1032,7 +1033,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1023,7 +1024,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } if ((i & 1) != 0) { diff --git a/patches/server/0130-Fast-resume.patch b/patches/server/0130-Fast-resume.patch index 59e7adcb..8b7843ad 100644 --- a/patches/server/0130-Fast-resume.patch +++ b/patches/server/0130-Fast-resume.patch @@ -66,10 +66,10 @@ index b133b977bc7d452b5032809f84f8ac2ff96ae5bb..be8280d421a483b354f88d6011700218 return this.removeTicketAtLevel(type, CoordinateUtils.getChunkKey(chunkPos), level, identifier); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5c03702896a837425dfa13fdd5db1056f9267a88..1fb5d965f33828067e44253bd50e4baeb09bfb0d 100644 +index 5d290f9335a510f4ddab7a78a96c0d8eedd4682e..502dfe1b2d030f9a2f484ced7d519342d58b79d5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -672,6 +672,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop