diff --git a/gradle.properties b/gradle.properties index edc061b..7e34c0c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.19.3-R0.1-SNAPSHOT mcVersion=1.19.3 -paperRef=4da844f1e3e375a24a0e518b0787ae909fa0e247 +paperRef=bb05fcf4ca55dc3afc57e723cba6eca530ae3c25 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0007-Player-canSee-by-entity-UUID.patch b/patches/api/0007-Player-canSee-by-entity-UUID.patch index 40133d7..edb9d9b 100644 --- a/patches/api/0007-Player-canSee-by-entity-UUID.patch +++ b/patches/api/0007-Player-canSee-by-entity-UUID.patch @@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c68df5e5cc63b26da8623cf27e257ef07a61897d..a9f50779740e7fcec98ac8a88742858776a1fe05 100644 +index d7d94b954262da0cbe11850cbc3ebd45e32c8c76..6acdd0c9a6ea65b06ad5dad4758efb64884daaf3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1509,6 +1509,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1563,6 +1563,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @org.jetbrains.annotations.ApiStatus.Experimental // Paper public boolean canSee(@NotNull Entity entity); diff --git a/patches/server/0064-Do-not-log-offline-mode-warning.patch b/patches/server/0064-Do-not-log-offline-mode-warning.patch index cf3821c..cbbd9c3 100644 --- a/patches/server/0064-Do-not-log-offline-mode-warning.patch +++ b/patches/server/0064-Do-not-log-offline-mode-warning.patch @@ -41,13 +41,13 @@ 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 70d375b9803b5b7a33aa02cc1554f6b857aa6613..e4284c16512bbabd25c538eb88bf81d7c5bef9ba 100644 +index afdd597c63703cca87b277f0b66786cd8f3bf9aa..5a92a8f24d3a6957cc3f8404bf3458f4c4058fb4 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -292,7 +292,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP); - // CraftBukkit end - +@@ -297,7 +297,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord"; + String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/"; + // Paper end - if (!this.usesAuthentication()) { + if (!"false".equalsIgnoreCase(System.getProperty("gale.log.warning.offline.mode")) && !this.usesAuthentication()) { // Gale - KeYi - do not log offline mode warning DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); diff --git a/patches/server/0080-Reduce-array-allocations.patch b/patches/server/0080-Reduce-array-allocations.patch index c96c1e3..de8aad4 100644 --- a/patches/server/0080-Reduce-array-allocations.patch +++ b/patches/server/0080-Reduce-array-allocations.patch @@ -482,7 +482,7 @@ index 89aaa846d5cb1cfd8ccf634f85bdc4180013cfd0..f69ea29648b090334d98dd8f3ed71cf8 return ret; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8d9e2573c6d9597699e74f19989dcde600a5fb61..f8ba64187acb6148f81b2c652813e6637c151bf0 100644 +index 8d537d9822fd88ec92acf57cf76e903678a12301..c6ffef9960f82eed929400296de027e4e297b8e7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -28,6 +28,8 @@ import java.util.function.UnaryOperator; @@ -544,7 +544,7 @@ index 8d9e2573c6d9597699e74f19989dcde600a5fb61..f8ba64187acb6148f81b2c652813e663 return; } // Paper end -@@ -3264,7 +3262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3270,7 +3268,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic // Paper start if (!org.bukkit.Bukkit.isPrimaryThread()) { if (recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) { @@ -766,7 +766,7 @@ index 71a36cf9b976443cca9ab63cd0eb23253f638562..201b0e1b25d0773bbcf9c1ed69fd888a for (int j = 0; j < i; ++j) { diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 6860096cb8c0deecc9c1d87543d1128fb95fd2d4..7626dfea095023343f041e0c5b6d0117873c1236 100644 +index 31eed67d07097c7eb1b06547a9f556bcc709d96c..561e0b938cbd52e4f4bacb2c903465efd8c0eadf 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -977,7 +977,7 @@ public final class ItemStack { diff --git a/patches/server/0112-Player-canSee-by-entity-UUID.patch b/patches/server/0112-Player-canSee-by-entity-UUID.patch deleted file mode 100644 index e500980..0000000 --- a/patches/server/0112-Player-canSee-by-entity-UUID.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Martijn Muijsers -Date: Tue, 29 Nov 2022 23:37:12 +0100 -Subject: [PATCH] Player#canSee by entity UUID - -License: MIT (https://opensource.org/licenses/MIT) -Gale - https://galemc.org - -This patch is based on the following patch: -"Spread out and optimise player list ticksSpread out and optimise player list ticks" -By: James Lyne -As part of: Purpur (https://github.com/PurpurMC/Purpur) -Licensed under: MIT (https://opensource.org/licenses/MIT) - -* Purpur copyright * - -MIT License - -Copyright (c) 2019-2022 PurpurMC - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7c43de6ad6bd7259c6bcb2a55e312e8abfcf546b..d274e9373f7507dd38f2e0162c8a683b1ddde04e 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1862,6 +1862,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - return !this.hiddenEntities.containsKey(entity.getUniqueId()); - } - -+ // Gale start - Purpur - Player#canSee by entity UUID -+ @Override -+ public boolean canSee(UUID entityUUID) { -+ return !this.hiddenEntities.containsKey(entityUUID); -+ } -+ // Gale end - Purpur - Player#canSee by entity UUID -+ - @Override - public Map serialize() { - Map result = new LinkedHashMap(); diff --git a/patches/server/0113-Spread-out-sending-all-player-info.patch b/patches/server/0112-Spread-out-sending-all-player-info.patch similarity index 99% rename from patches/server/0113-Spread-out-sending-all-player-info.patch rename to patches/server/0112-Spread-out-sending-all-player-info.patch index 64dd821..3e38bc5 100644 --- a/patches/server/0113-Spread-out-sending-all-player-info.patch +++ b/patches/server/0112-Spread-out-sending-all-player-info.patch @@ -157,7 +157,7 @@ index 91d009a0e48e68711f51aaf65d4c52c291f8b4b2..aa26e6796a5b2b8247b0336a61b0cf8f } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index e561886cb78f9455cee3607354e3c72401aba0dc..0efd68cfbcc3f6c1442bdc7163018f7640a06b20 100644 +index 685b69df4c63ef64d62476eb90bf82ee5f87814d..2737390659c08ec55731cce036c268d236da8260 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -40,6 +40,7 @@ import net.minecraft.network.syncher.SynchedEntityData; diff --git a/patches/server/0114-Optimize-player-list-for-sending-player-info.patch b/patches/server/0113-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0114-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0113-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0116-Send-multiple-keep-alive-packets.patch b/patches/server/0115-Send-multiple-keep-alive-packets.patch similarity index 97% rename from patches/server/0116-Send-multiple-keep-alive-packets.patch rename to patches/server/0115-Send-multiple-keep-alive-packets.patch index e3b0a28..689855c 100644 --- a/patches/server/0116-Send-multiple-keep-alive-packets.patch +++ b/patches/server/0115-Send-multiple-keep-alive-packets.patch @@ -37,7 +37,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/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f8ba64187acb6148f81b2c652813e6637c151bf0..4d7faeda716c5ac053cfb1d894f5a28e3a69f969 100644 +index c6ffef9960f82eed929400296de027e4e297b8e7..aa11cb23ff5bbdc84bdbda2cad8826485e60e7f4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader; @@ -91,7 +91,7 @@ index f8ba64187acb6148f81b2c652813e6637c151bf0..4d7faeda716c5ac053cfb1d894f5a28e if (this.keepAlivePending) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info -@@ -3466,6 +3487,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3472,6 +3493,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0117-Make-slow-login-timeout-configurable.patch b/patches/server/0116-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0117-Make-slow-login-timeout-configurable.patch rename to patches/server/0116-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0118-Make-max-interaction-distance-configurable.patch b/patches/server/0117-Make-max-interaction-distance-configurable.patch similarity index 97% rename from patches/server/0118-Make-max-interaction-distance-configurable.patch rename to patches/server/0117-Make-max-interaction-distance-configurable.patch index ae6d31f..afe164c 100644 --- a/patches/server/0118-Make-max-interaction-distance-configurable.patch +++ b/patches/server/0117-Make-max-interaction-distance-configurable.patch @@ -20,7 +20,7 @@ index 58b093bb1de78ee3b3b2ea364aa50474883f443a..7be34e5df2b6d33c1d7943c9c0b6fd06 this.debugLogging(pos, false, sequence, "too far"); } else if (pos.getY() >= worldHeight) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4d7faeda716c5ac053cfb1d894f5a28e3a69f969..14ee62567ace6fc1becf4257761a811d2ab6f71d 100644 +index aa11cb23ff5bbdc84bdbda2cad8826485e60e7f4..e000da425ba28330d1edcce3948d2becb39d2bd3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -250,7 +250,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -55,7 +55,7 @@ index 4d7faeda716c5ac053cfb1d894f5a28e3a69f969..14ee62567ace6fc1becf4257761a811d Vec3 vec3d2 = vec3d.subtract(vec3d1); double d0 = 1.0000001D; -@@ -2790,7 +2797,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2796,7 +2803,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; } diff --git a/patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 100% rename from patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch diff --git a/patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 97% rename from patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch index d36918d..02fce34 100644 --- a/patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.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/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9d74ef6973f6a9e12861256aa7032f8d746a97f5..285f99bdea5da7ff47889cdb55f94015ecaa3922 100644 +index c5984ad4d12fec9310156a7b7c7beddd3dc0ba57..ef0b6db4421a0c840e6381554a3db02298f33737 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1847,12 +1847,18 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0123-Ignore-null-legacy-structure-data.patch b/patches/server/0122-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0123-Ignore-null-legacy-structure-data.patch rename to patches/server/0122-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0124-Don-t-double-save-stored-user-lists.patch b/patches/server/0123-Don-t-double-save-stored-user-lists.patch similarity index 100% rename from patches/server/0124-Don-t-double-save-stored-user-lists.patch rename to patches/server/0123-Don-t-double-save-stored-user-lists.patch diff --git a/patches/server/0125-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0125-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0126-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0126-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0127-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0127-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0128-CraftBukkit-UUID-to-world-map.patch b/patches/server/0127-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0128-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0127-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0129-Global-EULA-file.patch b/patches/server/0128-Global-EULA-file.patch similarity index 100% rename from patches/server/0129-Global-EULA-file.patch rename to patches/server/0128-Global-EULA-file.patch diff --git a/patches/server/0130-Specific-interval-TPS-API.patch b/patches/server/0129-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0130-Specific-interval-TPS-API.patch rename to patches/server/0129-Specific-interval-TPS-API.patch diff --git a/patches/server/0131-5-second-TPS-average.patch b/patches/server/0130-5-second-TPS-average.patch similarity index 100% rename from patches/server/0131-5-second-TPS-average.patch rename to patches/server/0130-5-second-TPS-average.patch diff --git a/patches/server/0132-Measure-last-tick-time.patch b/patches/server/0131-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0132-Measure-last-tick-time.patch rename to patches/server/0131-Measure-last-tick-time.patch diff --git a/patches/server/0133-Last-tick-time-API.patch b/patches/server/0132-Last-tick-time-API.patch similarity index 100% rename from patches/server/0133-Last-tick-time-API.patch rename to patches/server/0132-Last-tick-time-API.patch diff --git a/patches/server/0134-Show-last-tick-time-in-tps-command.patch b/patches/server/0133-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0134-Show-last-tick-time-in-tps-command.patch rename to patches/server/0133-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0135-Increase-time-statistics-in-intervals.patch b/patches/server/0134-Increase-time-statistics-in-intervals.patch similarity index 98% rename from patches/server/0135-Increase-time-statistics-in-intervals.patch rename to patches/server/0134-Increase-time-statistics-in-intervals.patch index e9772b3..52928b9 100644 --- a/patches/server/0135-Increase-time-statistics-in-intervals.patch +++ b/patches/server/0134-Increase-time-statistics-in-intervals.patch @@ -45,7 +45,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/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 0efd68cfbcc3f6c1442bdc7163018f7640a06b20..23d3189b4d5c02254673d979cbaf1eda65d45e4b 100644 +index 2737390659c08ec55731cce036c268d236da8260..2dcdbcb6759ae6ff1e357722a49378294cf3325d 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -114,6 +114,7 @@ import net.minecraft.world.phys.AABB; diff --git a/patches/server/0136-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0136-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0137-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0136-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0137-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0136-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0138-Optimize-identical-item-checks.patch b/patches/server/0137-Optimize-identical-item-checks.patch similarity index 95% rename from patches/server/0138-Optimize-identical-item-checks.patch rename to patches/server/0137-Optimize-identical-item-checks.patch index cedda38..8408e2a 100644 --- a/patches/server/0138-Optimize-identical-item-checks.patch +++ b/patches/server/0137-Optimize-identical-item-checks.patch @@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 3cc1096880deea3eb5f50e38f4757455606e28c8..6a5452d6210bcc268d933f0051f1ce65f6dff4a1 100644 +index 2255eaf65338443f0ec99227df0a1e64608ea525..f8963e239354020c8e08460058541ddbaa07798c 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -706,14 +706,29 @@ public final class ItemStack { diff --git a/patches/server/0139-Reduce-RandomSource-instances.patch b/patches/server/0138-Reduce-RandomSource-instances.patch similarity index 98% rename from patches/server/0139-Reduce-RandomSource-instances.patch rename to patches/server/0138-Reduce-RandomSource-instances.patch index edaa782..6b06995 100644 --- a/patches/server/0139-Reduce-RandomSource-instances.patch +++ b/patches/server/0138-Reduce-RandomSource-instances.patch @@ -26,7 +26,7 @@ index 23dcdc71a8a6fd5472cdc1c22331b56c6bb3ded9..c3f88980f1ea2f7b04ad110494962725 double d1 = (double) (center.y - maxRange); double d2 = (double) (center.x + maxRange); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 285f99bdea5da7ff47889cdb55f94015ecaa3922..e6c2eff84ac596825a11574cf89956e70a344562 100644 +index ef0b6db4421a0c840e6381554a3db02298f33737..82dec221441ad4b76af0aebf788af801a275be64 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -391,7 +391,7 @@ public class ServerPlayer extends Player { @@ -61,7 +61,7 @@ index 1ef089dbf83de35d875c00efdf468c397be56978..b9f5dc95f859acb8f8fd4739537485af } diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java -index 7f3a7a769afec8449547c26453112064b9bcb04a..3da68454b8114cd52554670280107d5b5b156eab 100644 +index 15fb5ee374b19366ebb23181896fb943e95819f0..a7ccb6ea2abfaca54ae174f3ec1926eb233abe25 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java @@ -80,7 +80,7 @@ public class FishingHook extends Projectile { diff --git a/patches/server/0140-Server-thread-priority-environment-variable.patch b/patches/server/0139-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0140-Server-thread-priority-environment-variable.patch rename to patches/server/0139-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0141-Thread-safety-annotations.patch b/patches/server/0140-Thread-safety-annotations.patch similarity index 100% rename from patches/server/0141-Thread-safety-annotations.patch rename to patches/server/0140-Thread-safety-annotations.patch diff --git a/patches/server/0142-CPU-cores-estimation.patch b/patches/server/0141-CPU-cores-estimation.patch similarity index 98% rename from patches/server/0142-CPU-cores-estimation.patch rename to patches/server/0141-CPU-cores-estimation.patch index 1d3feab..7e42ca8 100644 --- a/patches/server/0142-CPU-cores-estimation.patch +++ b/patches/server/0141-CPU-cores-estimation.patch @@ -30,7 +30,7 @@ index dc9d304257d86109c06ec9b7673d3ee27d5ee875..781fc0a92f73be73b9313e7bc4eeb2f2 pair("hardwarespecs", hardwareSpecsMap), // Gale - include hardware specs in timings pair("runtime", runtimeBean.getUptime()), diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index f5ed3fa20097bdd43a25c76b38353a23743bc9e5..eed9f125df46b616b7234a2d669971bc51bc231b 100644 +index 5a92a8f24d3a6957cc3f8404bf3458f4c4058fb4..666114daf9e9a3f9f9e0779a3a40dfac09c80d60 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -49,6 +49,7 @@ import net.minecraft.world.level.block.entity.SkullBlockEntity; diff --git a/patches/server/0143-CheckableLock-utility.patch b/patches/server/0142-CheckableLock-utility.patch similarity index 100% rename from patches/server/0143-CheckableLock-utility.patch rename to patches/server/0142-CheckableLock-utility.patch diff --git a/patches/server/0144-Mutex-utility.patch b/patches/server/0143-Mutex-utility.patch similarity index 100% rename from patches/server/0144-Mutex-utility.patch rename to patches/server/0143-Mutex-utility.patch diff --git a/patches/server/0145-Thread-aware-lock-utility.patch b/patches/server/0144-Thread-aware-lock-utility.patch similarity index 100% rename from patches/server/0145-Thread-aware-lock-utility.patch rename to patches/server/0144-Thread-aware-lock-utility.patch diff --git a/patches/server/0146-Unterminable-executor-utility.patch b/patches/server/0145-Unterminable-executor-utility.patch similarity index 100% rename from patches/server/0146-Unterminable-executor-utility.patch rename to patches/server/0145-Unterminable-executor-utility.patch diff --git a/patches/server/0147-FIFO-concurrent-queue-utility.patch b/patches/server/0146-FIFO-concurrent-queue-utility.patch similarity index 100% rename from patches/server/0147-FIFO-concurrent-queue-utility.patch rename to patches/server/0146-FIFO-concurrent-queue-utility.patch diff --git a/patches/server/0148-Base-thread-pool.patch b/patches/server/0147-Base-thread-pool.patch similarity index 99% rename from patches/server/0148-Base-thread-pool.patch rename to patches/server/0147-Base-thread-pool.patch index 7d69521..81953f8 100644 --- a/patches/server/0148-Base-thread-pool.patch +++ b/patches/server/0147-Base-thread-pool.patch @@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java -index 4f3670b2bdb8b1b252e9f074a6af56a018a8c465..aa7467c0ce302c27d77f0af032b81c4f8ef9408d 100644 +index cab91880a08c6fdc545804911d295e0f24f4d983..f8bf00ac23f8b86a5dab81668d595d4ad043f09f 100644 --- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java @@ -22,6 +22,7 @@ import net.minecraft.world.level.block.EntityBlock; @@ -1366,7 +1366,7 @@ index f0a7a8df3caa2ea765bb0a87cfede71d0995d276..16f3475b059d2b6b85d2b342e84ab32d // CraftBukkit start TimeSkipEvent event = new TimeSkipEvent(worldserver.getWorld(), TimeSkipEvent.SkipReason.COMMAND, time); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 5292616c846d495b1d7be040cecf47fb33412191..b49b2fe152b70c8020ba2edc48d46cc4fe8d525e 100644 +index 666114daf9e9a3f9f9e0779a3a40dfac09c80d60..1141b3a88e2eb1baa705b4f781353df0305a7c85 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -49,6 +49,7 @@ import net.minecraft.world.level.block.entity.SkullBlockEntity; @@ -1443,7 +1443,7 @@ index 37e0b6212fec71ec9662e6be3b1e8bea487eb4a6..e7747b19685fd943d7fbefbfef656f8b for (Object o : worldData.cache.values() ) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 14ee62567ace6fc1becf4257761a811d2ab6f71d..f62da01d38533818de70761c82ffb959083e0811 100644 +index e000da425ba28330d1edcce3948d2becb39d2bd3..27b6cf330216bc6e41b67940ed6aa848e0251686 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -185,8 +185,9 @@ import net.minecraft.world.phys.shapes.BooleanOp; @@ -1575,7 +1575,7 @@ index 14ee62567ace6fc1becf4257761a811d2ab6f71d..f62da01d38533818de70761c82ffb959 return Optional.empty(); } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false)); -@@ -3290,7 +3288,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3296,7 +3294,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic // Paper start if (!org.bukkit.Bukkit.isPrimaryThread()) { if (recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) { @@ -1755,7 +1755,7 @@ index 83701fbfaa56a232593ee8f11a3afb8941238bfa..392e7b4a89669f16b32043b65b69e659 this.execute(runnable); } diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index 9948cc4c65d5681c171b38cdf7cf3e63a01e4364..cba854bdcab80ba411096ef4fd97e46861764d48 100644 +index 93f722537a6b479561d79ba2e980c50a324f9486..728f52999ea980ea2cef97ba80d3da96dffac7d8 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -98,7 +98,7 @@ public abstract class Projectile extends Entity { @@ -1799,7 +1799,7 @@ index e23fdd5ba09b50b7eef0ca4f36c5480779fba624..a7bb3275b2da8308696b18fb527514f9 if (entity != null) { return entity.getBukkitEntity(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4cb0307935aa63d44aac55c80ee50be074d7913c..949feba1264bcafb8dc2dcecd0a566fea80a2ba0 100644 +index 54932d92b13b890b07f827c5f09bd137383d4ab5..9d7da4fcf4ab450b6f3d53a07c299884fe29cda0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -5,7 +5,6 @@ import com.google.common.base.Predicates; @@ -1834,7 +1834,7 @@ index 4cb0307935aa63d44aac55c80ee50be074d7913c..949feba1264bcafb8dc2dcecd0a566fe public class CraftWorld extends CraftRegionAccessor implements World { public static final int CUSTOM_DIMENSION_OFFSET = 10; -@@ -2356,11 +2354,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2372,11 +2370,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { java.util.concurrent.CompletableFuture ret = new java.util.concurrent.CompletableFuture<>(); io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(this.getHandle(), x, z, gen, ChunkStatus.FULL, true, priority, (c) -> { diff --git a/patches/server/0149-Watch-for-blocking-base-threads.patch b/patches/server/0148-Watch-for-blocking-base-threads.patch similarity index 100% rename from patches/server/0149-Watch-for-blocking-base-threads.patch rename to patches/server/0148-Watch-for-blocking-base-threads.patch diff --git a/patches/server/0150-Non-blocking-PooledObjects.patch b/patches/server/0149-Non-blocking-PooledObjects.patch similarity index 100% rename from patches/server/0150-Non-blocking-PooledObjects.patch rename to patches/server/0149-Non-blocking-PooledObjects.patch diff --git a/patches/server/0151-Yielding-memoized-Supplier.patch b/patches/server/0150-Yielding-memoized-Supplier.patch similarity index 99% rename from patches/server/0151-Yielding-memoized-Supplier.patch rename to patches/server/0150-Yielding-memoized-Supplier.patch index 061d622..1e090d4 100644 --- a/patches/server/0151-Yielding-memoized-Supplier.patch +++ b/patches/server/0150-Yielding-memoized-Supplier.patch @@ -209,7 +209,7 @@ index 95ba37458e8154dbce6a8590508840d694fcbed1..24af3be284d5ed693ec932e53935a777 this.triggerSlotListeners(i, itemstack, supplier); this.synchronizeSlotToRemote(i, itemstack, supplier); diff --git a/src/main/java/net/minecraft/world/item/HoneycombItem.java b/src/main/java/net/minecraft/world/item/HoneycombItem.java -index 1f8b7b50c6aa24778d87821ae2ff4d019d176082..d63da08e75e25860e5ae54674d32f5b3ff421e22 100644 +index f0b720eafc538f97d788f89bd2f2e9da0ff84a19..d12020b2eca0130340436d38247f933f6b246f01 100644 --- a/src/main/java/net/minecraft/world/item/HoneycombItem.java +++ b/src/main/java/net/minecraft/world/item/HoneycombItem.java @@ -16,12 +16,13 @@ import net.minecraft.world.level.block.Block; diff --git a/patches/server/0152-Yielding-ChunkHolderManager.patch b/patches/server/0151-Yielding-ChunkHolderManager.patch similarity index 100% rename from patches/server/0152-Yielding-ChunkHolderManager.patch rename to patches/server/0151-Yielding-ChunkHolderManager.patch diff --git a/patches/server/0153-Run-async-executor-tasks-on-base-thread-pool.patch b/patches/server/0152-Run-async-executor-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0153-Run-async-executor-tasks-on-base-thread-pool.patch rename to patches/server/0152-Run-async-executor-tasks-on-base-thread-pool.patch diff --git a/patches/server/0154-Run-background-executor-tasks-on-base-thread-pool.patch b/patches/server/0153-Run-background-executor-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0154-Run-background-executor-tasks-on-base-thread-pool.patch rename to patches/server/0153-Run-background-executor-tasks-on-base-thread-pool.patch diff --git a/patches/server/0155-Run-world-upgrade-tasks-on-base-thread-pool.patch b/patches/server/0154-Run-world-upgrade-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0155-Run-world-upgrade-tasks-on-base-thread-pool.patch rename to patches/server/0154-Run-world-upgrade-tasks-on-base-thread-pool.patch diff --git a/patches/server/0156-Run-tab-completion-tasks-on-base-thread-pool.patch b/patches/server/0155-Run-tab-completion-tasks-on-base-thread-pool.patch similarity index 94% rename from patches/server/0156-Run-tab-completion-tasks-on-base-thread-pool.patch rename to patches/server/0155-Run-tab-completion-tasks-on-base-thread-pool.patch index f4610cf..9b6b2fb 100644 --- a/patches/server/0156-Run-tab-completion-tasks-on-base-thread-pool.patch +++ b/patches/server/0155-Run-tab-completion-tasks-on-base-thread-pool.patch @@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f62da01d38533818de70761c82ffb959083e0811..93a533bdeb5108f5c3e758f8062de083283fd075 100644 +index 27b6cf330216bc6e41b67940ed6aa848e0251686..8fd2a0a9f3990742c17d471b143c672163eb76aa 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -884,8 +884,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0157-Run-text-filter-tasks-on-base-thread-pool.patch b/patches/server/0156-Run-text-filter-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0157-Run-text-filter-tasks-on-base-thread-pool.patch rename to patches/server/0156-Run-text-filter-tasks-on-base-thread-pool.patch diff --git a/patches/server/0158-Run-cleaner-tasks-on-base-thread-pool.patch b/patches/server/0157-Run-cleaner-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0158-Run-cleaner-tasks-on-base-thread-pool.patch rename to patches/server/0157-Run-cleaner-tasks-on-base-thread-pool.patch diff --git a/patches/server/0159-Run-chunk-cache-tasks-on-base-thread-pool.patch b/patches/server/0158-Run-chunk-cache-tasks-on-base-thread-pool.patch similarity index 99% rename from patches/server/0159-Run-chunk-cache-tasks-on-base-thread-pool.patch rename to patches/server/0158-Run-chunk-cache-tasks-on-base-thread-pool.patch index be2a77a..bbc74e7 100644 --- a/patches/server/0159-Run-chunk-cache-tasks-on-base-thread-pool.patch +++ b/patches/server/0158-Run-chunk-cache-tasks-on-base-thread-pool.patch @@ -20,7 +20,7 @@ index 896c3ff7ddb07f1f6f05f90e1e3fe7fb615071d4..1dfee2b857f2a37fa1bb9b8e16380996 public DistanceTrackingAreaMap() { this(new PooledLinkedHashSets<>()); diff --git a/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java -index 0b060183429f4c72ec767075538477b4302bbf0d..cef1c544a7fb6897fb7d86f5f4e31f7ba21fd417 100644 +index e77972c4c264100ffdd824bfa2dac58dbbc6d678..b2e4fb69fd6564484e0ebd120ba87431c5c158e4 100644 --- a/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java +++ b/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java @@ -718,7 +718,7 @@ public final class PlayerChunkLoader { @@ -355,7 +355,7 @@ index bca581f2a192015f5461e5bf776234687e5ae9fc..b488cad0d22be10bfeff853ee56e09d4 return; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 949feba1264bcafb8dc2dcecd0a566fea80a2ba0..628c33ee1693c9c7f441ab4c8881c50acb50cb9f 100644 +index 9d7da4fcf4ab450b6f3d53a07c299884fe29cda0..5c407537b5b0d84031baf34802648eb04791d901 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -362,7 +362,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0160-Run-TickThread-chunk-tasks-on-base-thread-pool.patch b/patches/server/0159-Run-TickThread-chunk-tasks-on-base-thread-pool.patch similarity index 98% rename from patches/server/0160-Run-TickThread-chunk-tasks-on-base-thread-pool.patch rename to patches/server/0159-Run-TickThread-chunk-tasks-on-base-thread-pool.patch index ed412bf..a9b72aa 100644 --- a/patches/server/0160-Run-TickThread-chunk-tasks-on-base-thread-pool.patch +++ b/patches/server/0159-Run-TickThread-chunk-tasks-on-base-thread-pool.patch @@ -83,7 +83,7 @@ index 84cc9397237fa0c17aa1012dfb5683c90eb6d3b8..f5c15d40094c2ddc6220b0595597d121 final ReentrantLock schedulingLock = new ReentrantLock(); public final ChunkHolderManager chunkHolderManager; diff --git a/src/main/java/org/galemc/gale/executor/queue/AllLevelsScheduledTaskQueue.java b/src/main/java/org/galemc/gale/executor/queue/AllLevelsScheduledTaskQueue.java -index c2acd36b3101042f39afe1436836078dcce2100d..36b844cfe3a3877496931ec739f6d5af84f32748 100644 +index ed642b13e95479d0ec98731a3f5b74cf2fb78f81..05b1817756925c49b1228ff79a5e11b37bc75834 100644 --- a/src/main/java/org/galemc/gale/executor/queue/AllLevelsScheduledTaskQueue.java +++ b/src/main/java/org/galemc/gale/executor/queue/AllLevelsScheduledTaskQueue.java @@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/server/0161-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch b/patches/server/0160-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch similarity index 100% rename from patches/server/0161-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch rename to patches/server/0160-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch diff --git a/patches/server/0162-Run-chunk-worker-tasks-on-base-thread-pool.patch b/patches/server/0161-Run-chunk-worker-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0162-Run-chunk-worker-tasks-on-base-thread-pool.patch rename to patches/server/0161-Run-chunk-worker-tasks-on-base-thread-pool.patch diff --git a/patches/server/0163-Split-tick-steps.patch b/patches/server/0162-Split-tick-steps.patch similarity index 100% rename from patches/server/0163-Split-tick-steps.patch rename to patches/server/0162-Split-tick-steps.patch diff --git a/patches/server/0164-Multithreaded-ticking.patch b/patches/server/0163-Multithreaded-ticking.patch similarity index 100% rename from patches/server/0164-Multithreaded-ticking.patch rename to patches/server/0163-Multithreaded-ticking.patch diff --git a/patches/server/0165-Yielding-ChunkTaskScheduler.patch b/patches/server/0164-Yielding-ChunkTaskScheduler.patch similarity index 100% rename from patches/server/0165-Yielding-ChunkTaskScheduler.patch rename to patches/server/0164-Yielding-ChunkTaskScheduler.patch