diff --git a/gradle.properties b/gradle.properties index 09cd4bc4..8bf389b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=cn.dreeam.leaf mcVersion=1.21.8 version=1.21.8-R0.1-SNAPSHOT -paperCommit=38fe16b5f274068df445ce89d84cd39492d1c5da +paperCommit=51706e5ac1305c8490538a44c9b7019df0ac2bfc org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/leaf-api/paper-patches/features/0015-Better-warning-message-for-discouraging-Maven-Centra.patch b/leaf-api/paper-patches/features/0015-Better-warning-message-for-discouraging-Maven-Centra.patch index ee27a79d..b893a95f 100644 --- a/leaf-api/paper-patches/features/0015-Better-warning-message-for-discouraging-Maven-Centra.patch +++ b/leaf-api/paper-patches/features/0015-Better-warning-message-for-discouraging-Maven-Centra.patch @@ -10,7 +10,7 @@ This able to switch back to maven central repo, to prevent situation that dependencies exist in maven central, but not in mirror. diff --git a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java -index c1fccd64b1329e31ccf7e6a11853ce3a749b7ea4..6e0be8c43502aece01371554c3ff60cb97f12944 100644 +index 298bb04c294a89ad783eb3dac73faf47fa5fb1ba..bb715d2ee5b0c548ac2d2d07bfaa2cb456794bb9 100644 --- a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java +++ b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java @@ -122,7 +122,7 @@ public class MavenLibraryResolver implements ClassPathLibrary { @@ -19,6 +19,6 @@ index c1fccd64b1329e31ccf7e6a11853ce3a749b7ea4..6e0be8c43502aece01371554c3ff60cb LOGGER.warn( - "Use of Maven Central as a CDN is against the Maven Central Terms of Service. Use MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR instead.", + "Use of Maven Central as a CDN is against the Maven Central Terms of Service. Use MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR instead. DO NOT report this to Paper or Leaf! Please contact plugin's support to adapt this change.", // Leaf - Better warning message for discouraging Maven Central as CDN - new RuntimeException("Plugin used Maven Central for library resolution") + new RuntimeException("Plugin used Maven Central for library resolution (%s)".formatted(remoteRepository.toString())) ); } diff --git a/leaf-api/paper-patches/features/0016-Configurable-LibraryLoader-maven-repos.patch b/leaf-api/paper-patches/features/0016-Configurable-LibraryLoader-maven-repos.patch index 9bedb0f6..2486ee6d 100644 --- a/leaf-api/paper-patches/features/0016-Configurable-LibraryLoader-maven-repos.patch +++ b/leaf-api/paper-patches/features/0016-Configurable-LibraryLoader-maven-repos.patch @@ -7,7 +7,7 @@ Add JVM flag `-DLeaf.library-download-repo=link` to choose library download repo e.g. `-DLeaf.library-download-repo=https://maven.aliyun.com/repository/public` diff --git a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java -index 0c0c14936bf5a45ac7e2bf486cdb82da31b33b46..68400696343ab0846d3a4c9bb29c98e1f0d83584 100644 +index bb715d2ee5b0c548ac2d2d07bfaa2cb456794bb9..91fcd904bc01be3e05e64023e31ce08cc2a836c9 100644 --- a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java +++ b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java @@ -59,12 +59,25 @@ public class MavenLibraryResolver implements ClassPathLibrary { @@ -54,7 +54,7 @@ index 0c0c14936bf5a45ac7e2bf486cdb82da31b33b46..68400696343ab0846d3a4c9bb29c98e1 + // Leaf end - Configurable LibraryLoader maven repos LOGGER.warn( "Use of Maven Central as a CDN is against the Maven Central Terms of Service. Use MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR instead. DO NOT report this to Paper or Leaf! Please contact plugin's support to adapt this change.", // Leaf - Better warning message for discouraging Maven Central as CDN - new RuntimeException("Plugin used Maven Central for library resolution") + new RuntimeException("Plugin used Maven Central for library resolution (%s)".formatted(remoteRepository.toString())) ); + // Leaf start - Configurable LibraryLoader maven repos + } diff --git a/leaf-server/minecraft-patches/features/0014-Reduce-acquire-POI-for-stuck-entities.patch b/leaf-archived-patches/removed/1.21.8/mcserver/0014-Reduce-acquire-POI-for-stuck-entities.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0014-Reduce-acquire-POI-for-stuck-entities.patch rename to leaf-archived-patches/removed/1.21.8/mcserver/0014-Reduce-acquire-POI-for-stuck-entities.patch index d7b0e8f7..890a9b59 100644 --- a/leaf-server/minecraft-patches/features/0014-Reduce-acquire-POI-for-stuck-entities.patch +++ b/leaf-archived-patches/removed/1.21.8/mcserver/0014-Reduce-acquire-POI-for-stuck-entities.patch @@ -3,6 +3,8 @@ From: Martijn Muijsers Date: Wed, 23 Nov 2022 20:12:48 +0100 Subject: [PATCH] Reduce acquire POI for stuck entities +Removed since Leaf 1.21.8, added in Paper as `stuckEntityPoiRetryDelay` in Paper world config + License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/leaf-server/minecraft-patches/features/0015-Check-targeting-range-before-getting-visibility.patch b/leaf-server/minecraft-patches/features/0014-Check-targeting-range-before-getting-visibility.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0015-Check-targeting-range-before-getting-visibility.patch rename to leaf-server/minecraft-patches/features/0014-Check-targeting-range-before-getting-visibility.patch diff --git a/leaf-server/minecraft-patches/features/0016-Cache-on-climbable-check.patch b/leaf-server/minecraft-patches/features/0015-Cache-on-climbable-check.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0016-Cache-on-climbable-check.patch rename to leaf-server/minecraft-patches/features/0015-Cache-on-climbable-check.patch index e2ac01eb..4f95f747 100644 --- a/leaf-server/minecraft-patches/features/0016-Cache-on-climbable-check.patch +++ b/leaf-server/minecraft-patches/features/0015-Cache-on-climbable-check.patch @@ -44,7 +44,7 @@ index ae2bb9a73106febfe5f0d090abd4252bbb5fd27e..eee9c41e40402e52b73f34a734b4cbde } if (entity instanceof final Mob mob && mob.getTarget() != null) { diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 97431aa47b5425578bf14b992596962c64c87f35..e174c7b8c637e6983cf0778e6956d8d11e9cd7d1 100644 +index c2f93f2e71ea5cab84a5821d952a6f90dc1068ed..bd22f0bca65be702a92641a95e944e43f882e440 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -2115,6 +2115,21 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0017-Make-EntityCollisionContext-a-live-representation.patch b/leaf-server/minecraft-patches/features/0016-Make-EntityCollisionContext-a-live-representation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0017-Make-EntityCollisionContext-a-live-representation.patch rename to leaf-server/minecraft-patches/features/0016-Make-EntityCollisionContext-a-live-representation.patch diff --git a/leaf-server/minecraft-patches/features/0018-Better-checking-for-useless-move-packets.patch b/leaf-server/minecraft-patches/features/0017-Better-checking-for-useless-move-packets.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0018-Better-checking-for-useless-move-packets.patch rename to leaf-server/minecraft-patches/features/0017-Better-checking-for-useless-move-packets.patch diff --git a/leaf-server/minecraft-patches/features/0019-Block-goal-does-not-load-chunks.patch b/leaf-server/minecraft-patches/features/0018-Block-goal-does-not-load-chunks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0019-Block-goal-does-not-load-chunks.patch rename to leaf-server/minecraft-patches/features/0018-Block-goal-does-not-load-chunks.patch diff --git a/leaf-server/minecraft-patches/features/0020-Remove-lambda-from-ticking-guard.patch b/leaf-server/minecraft-patches/features/0019-Remove-lambda-from-ticking-guard.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0020-Remove-lambda-from-ticking-guard.patch rename to leaf-server/minecraft-patches/features/0019-Remove-lambda-from-ticking-guard.patch index 2368f98d..9d6148ac 100644 --- a/leaf-server/minecraft-patches/features/0020-Remove-lambda-from-ticking-guard.patch +++ b/leaf-server/minecraft-patches/features/0019-Remove-lambda-from-ticking-guard.patch @@ -58,7 +58,7 @@ index 6bc70c1d53049a1f75268ab9944bfb1557ca74ee..a9c2f419200483673f6743ed94af110a } } diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index 19a9b37bad1d465440047cbde9a00b12ba5d9a4b..b62ee276e2176da439ac2f4da4501861da746004 100644 +index a4c915c8fdd167bfa2c5ef20c5ec7acc53c89726..a0254e85fccebb66ce02bd58f9d461addd8ad73d 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java @@ -1489,10 +1489,10 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl diff --git a/leaf-server/minecraft-patches/features/0021-SIMD-support.patch b/leaf-server/minecraft-patches/features/0020-SIMD-support.patch similarity index 93% rename from leaf-server/minecraft-patches/features/0021-SIMD-support.patch rename to leaf-server/minecraft-patches/features/0020-SIMD-support.patch index 31a68efc..bb1bb191 100644 --- a/leaf-server/minecraft-patches/features/0021-SIMD-support.patch +++ b/leaf-server/minecraft-patches/features/0020-SIMD-support.patch @@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index 35f55d1830d7929d476a5377f0abc46fac5bfed1..1fc423f34b4731267e49326053443b90176e34d7 100644 +index b63f1b27c60faf90b3d991b9a88b0642afa29a93..38266ae67c440e94d30cd16ab09232906e1e8d7d 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -190,6 +190,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/leaf-server/minecraft-patches/features/0022-Make-book-writing-configurable.patch b/leaf-server/minecraft-patches/features/0021-Make-book-writing-configurable.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0022-Make-book-writing-configurable.patch rename to leaf-server/minecraft-patches/features/0021-Make-book-writing-configurable.patch index 86ba9319..c0c3a1dd 100644 --- a/leaf-server/minecraft-patches/features/0022-Make-book-writing-configurable.patch +++ b/leaf-server/minecraft-patches/features/0021-Make-book-writing-configurable.patch @@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this functionality before additional exploits are found. diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c61e8b5202a6ac6fcca8d1d7cbe8addecd42778e..1204f5833ebceebe17e95fb6c9563e658047fba7 100644 +index ca13dd72f173be6714965c506f2d48dcd3c9e569..81d6bad5ef230de7852c79a607eb2f5aa32768da 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1269,6 +1269,11 @@ public class ServerGamePacketListenerImpl diff --git a/leaf-server/minecraft-patches/features/0023-Reduce-in-wall-checks.patch b/leaf-server/minecraft-patches/features/0022-Reduce-in-wall-checks.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0023-Reduce-in-wall-checks.patch rename to leaf-server/minecraft-patches/features/0022-Reduce-in-wall-checks.patch index fcd3b6e1..303458d1 100644 --- a/leaf-server/minecraft-patches/features/0023-Reduce-in-wall-checks.patch +++ b/leaf-server/minecraft-patches/features/0022-Reduce-in-wall-checks.patch @@ -28,7 +28,7 @@ but is so much cheaper than the suffocation check that it's worth keeping it. diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index e174c7b8c637e6983cf0778e6956d8d11e9cd7d1..dc7d53e93a49297e3a5e1204025b3a50e73fba4e 100644 +index bd22f0bca65be702a92641a95e944e43f882e440..1b7d8a8838e9b75bc12ce4b9f30429110e9af913 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -433,7 +433,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0024-Make-chat-order-verification-configurable.patch b/leaf-server/minecraft-patches/features/0023-Make-chat-order-verification-configurable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0024-Make-chat-order-verification-configurable.patch rename to leaf-server/minecraft-patches/features/0023-Make-chat-order-verification-configurable.patch diff --git a/leaf-server/minecraft-patches/features/0025-Make-ender-dragon-respawn-attempt-after-placing-end-.patch b/leaf-server/minecraft-patches/features/0024-Make-ender-dragon-respawn-attempt-after-placing-end-.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0025-Make-ender-dragon-respawn-attempt-after-placing-end-.patch rename to leaf-server/minecraft-patches/features/0024-Make-ender-dragon-respawn-attempt-after-placing-end-.patch diff --git a/leaf-server/minecraft-patches/features/0026-Make-saving-fireworks-configurable.patch b/leaf-server/minecraft-patches/features/0025-Make-saving-fireworks-configurable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0026-Make-saving-fireworks-configurable.patch rename to leaf-server/minecraft-patches/features/0025-Make-saving-fireworks-configurable.patch diff --git a/leaf-server/minecraft-patches/features/0027-Reduce-hopper-item-checks.patch b/leaf-server/minecraft-patches/features/0026-Reduce-hopper-item-checks.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0027-Reduce-hopper-item-checks.patch rename to leaf-server/minecraft-patches/features/0026-Reduce-hopper-item-checks.patch index 4d58edea..9191909b 100644 --- a/leaf-server/minecraft-patches/features/0027-Reduce-hopper-item-checks.patch +++ b/leaf-server/minecraft-patches/features/0026-Reduce-hopper-item-checks.patch @@ -105,7 +105,7 @@ index 484c2ba2752fbf3ad929e46c2f078e906f6f0637..6ced5a7e27703a7cf5a7495dc3a1a290 double getLevelY(); diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 800b7e78ae989868ed0b9e060c80dcd002759412..2a49f65a2ea13414099b636f463239ced4fbb5f6 100644 +index 01ed25d1f895d94485b5fecd98476534cbb26930..c1fcd9e0ab47332ce48e391c6cd1455960340df3 100644 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -544,7 +544,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen @@ -117,7 +117,7 @@ index 800b7e78ae989868ed0b9e060c80dcd002759412..2a49f65a2ea13414099b636f463239ce for (ItemEntity itemEntity : getItemsAtAndAbove(level, hopper)) { if (addItem(hopper, itemEntity)) { return true; -@@ -820,6 +820,34 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -822,6 +822,34 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen return stack1.getCount() < stack1.getMaxStackSize() && ItemStack.isSameItemSameComponents(stack1, stack2); // Paper - Perf: Optimize Hoppers; used to return true for full itemstacks?! } diff --git a/leaf-server/minecraft-patches/features/0028-Reduce-villager-item-re-pickup.patch b/leaf-server/minecraft-patches/features/0027-Reduce-villager-item-re-pickup.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0028-Reduce-villager-item-re-pickup.patch rename to leaf-server/minecraft-patches/features/0027-Reduce-villager-item-re-pickup.patch diff --git a/leaf-server/minecraft-patches/features/0029-Variable-entity-wake-up-duration.patch b/leaf-server/minecraft-patches/features/0028-Variable-entity-wake-up-duration.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0029-Variable-entity-wake-up-duration.patch rename to leaf-server/minecraft-patches/features/0028-Variable-entity-wake-up-duration.patch diff --git a/leaf-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch b/leaf-server/minecraft-patches/features/0029-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 91% rename from leaf-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch rename to leaf-server/minecraft-patches/features/0029-Do-not-process-chat-commands-before-player-has-joine.patch index cb48b88d..e6ba981b 100644 --- a/leaf-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch +++ b/leaf-server/minecraft-patches/features/0029-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/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 4132ebc316af92aedd3b5f21d291e7d57560e985..8df0dbadca1dc72ac8d267654414044eb988ee43 100644 +index 822691293834c4da31adb2573fbc87467db2daa5..917908e69154c5c5c9f847ae47548ee3d9221bc2 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -424,6 +424,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @@ -25,7 +25,7 @@ index 4132ebc316af92aedd3b5f21d291e7d57560e985..8df0dbadca1dc72ac8d267654414044e public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent public @Nullable org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1204f5833ebceebe17e95fb6c9563e658047fba7..85eb002679ab395aba52757a84d968342231d792 100644 +index 81d6bad5ef230de7852c79a607eb2f5aa32768da..08c0b02e8f70dfc349da2b534435b5f09f99e2b8 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2443,7 +2443,7 @@ public class ServerGamePacketListenerImpl @@ -38,7 +38,7 @@ index 1204f5833ebceebe17e95fb6c9563e658047fba7..85eb002679ab395aba52757a84d96834 // CraftBukkit start if (sync) { diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index b09c1735acb57b6230225f88e0fc710ad61af119..39b977927a22956634b7c31818df0544814004fc 100644 +index 33b1a6fdf169001093642cc8200d2789e80692b0..c0129b6e5c74a5412546c167fb03b705686c996f 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -335,6 +335,8 @@ public abstract class PlayerList { diff --git a/leaf-server/minecraft-patches/features/0031-Do-not-log-invalid-statistics.patch b/leaf-server/minecraft-patches/features/0030-Do-not-log-invalid-statistics.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0031-Do-not-log-invalid-statistics.patch rename to leaf-server/minecraft-patches/features/0030-Do-not-log-invalid-statistics.patch diff --git a/leaf-server/minecraft-patches/features/0032-Do-not-log-empty-message-warnings.patch b/leaf-server/minecraft-patches/features/0031-Do-not-log-empty-message-warnings.patch similarity index 93% rename from leaf-server/minecraft-patches/features/0032-Do-not-log-empty-message-warnings.patch rename to leaf-server/minecraft-patches/features/0031-Do-not-log-empty-message-warnings.patch index 6b3b14bc..a1d8480c 100644 --- a/leaf-server/minecraft-patches/features/0032-Do-not-log-empty-message-warnings.patch +++ b/leaf-server/minecraft-patches/features/0031-Do-not-log-empty-message-warnings.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 85eb002679ab395aba52757a84d968342231d792..1729f36ec81f0f7ac0bf494513e6b0ceba87e063 100644 +index 08c0b02e8f70dfc349da2b534435b5f09f99e2b8..7b4eb3773bc88cc5b5287b55388a4dab2a2f562b 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2525,7 +2525,7 @@ public class ServerGamePacketListenerImpl diff --git a/leaf-server/minecraft-patches/features/0033-Do-not-log-ignored-advancements.patch b/leaf-server/minecraft-patches/features/0032-Do-not-log-ignored-advancements.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0033-Do-not-log-ignored-advancements.patch rename to leaf-server/minecraft-patches/features/0032-Do-not-log-ignored-advancements.patch diff --git a/leaf-server/minecraft-patches/features/0034-Do-not-log-setBlock-in-far-chunks.patch b/leaf-server/minecraft-patches/features/0033-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0034-Do-not-log-setBlock-in-far-chunks.patch rename to leaf-server/minecraft-patches/features/0033-Do-not-log-setBlock-in-far-chunks.patch diff --git a/leaf-server/minecraft-patches/features/0035-Do-not-log-unrecognized-recipes.patch b/leaf-server/minecraft-patches/features/0034-Do-not-log-unrecognized-recipes.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0035-Do-not-log-unrecognized-recipes.patch rename to leaf-server/minecraft-patches/features/0034-Do-not-log-unrecognized-recipes.patch index 8a366998..3ed2c4ec 100644 --- a/leaf-server/minecraft-patches/features/0035-Do-not-log-unrecognized-recipes.patch +++ b/leaf-server/minecraft-patches/features/0034-Do-not-log-unrecognized-recipes.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/net/minecraft/stats/ServerRecipeBook.java b/net/minecraft/stats/ServerRecipeBook.java -index 7e1a06b97ab0c744e910df1c82454ce5686c1870..5e12e021d6e3b01f0d209c23255fab0a232f69cb 100644 +index 736a52c23da313bec6b25a9d1abf08816462403c..ad12ca2a43e75aee60c55b4b686ac3ffae19a6c1 100644 --- a/net/minecraft/stats/ServerRecipeBook.java +++ b/net/minecraft/stats/ServerRecipeBook.java -@@ -102,7 +102,7 @@ public class ServerRecipeBook extends RecipeBook { +@@ -106,7 +106,7 @@ public class ServerRecipeBook extends RecipeBook { private void loadRecipes(List>> recipes, Consumer>> output, Predicate>> isRecognized) { for (ResourceKey> resourceKey : recipes) { if (!isRecognized.test(resourceKey)) { diff --git a/leaf-server/minecraft-patches/features/0036-Do-not-log-expired-message-warnings.patch b/leaf-server/minecraft-patches/features/0035-Do-not-log-expired-message-warnings.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0036-Do-not-log-expired-message-warnings.patch rename to leaf-server/minecraft-patches/features/0035-Do-not-log-expired-message-warnings.patch diff --git a/leaf-server/minecraft-patches/features/0037-Do-not-log-Not-Secure-marker.patch b/leaf-server/minecraft-patches/features/0036-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0037-Do-not-log-Not-Secure-marker.patch rename to leaf-server/minecraft-patches/features/0036-Do-not-log-Not-Secure-marker.patch diff --git a/leaf-server/minecraft-patches/features/0038-Do-not-log-disconnections-with-null-id.patch b/leaf-server/minecraft-patches/features/0037-Do-not-log-disconnections-with-null-id.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0038-Do-not-log-disconnections-with-null-id.patch rename to leaf-server/minecraft-patches/features/0037-Do-not-log-disconnections-with-null-id.patch diff --git a/leaf-server/minecraft-patches/features/0039-Do-not-log-run-as-root-warning.patch b/leaf-server/minecraft-patches/features/0038-Do-not-log-run-as-root-warning.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0039-Do-not-log-run-as-root-warning.patch rename to leaf-server/minecraft-patches/features/0038-Do-not-log-run-as-root-warning.patch index e827b480..28a06993 100644 --- a/leaf-server/minecraft-patches/features/0039-Do-not-log-run-as-root-warning.patch +++ b/leaf-server/minecraft-patches/features/0038-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/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index 1fc423f34b4731267e49326053443b90176e34d7..083e0154ec373d5ebe18ecbe55c88e4407d61a81 100644 +index 38266ae67c440e94d30cd16ab09232906e1e8d7d..e7e4262981bcbf75a5c6a76f4588c91de15bf975 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -142,7 +142,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/leaf-server/minecraft-patches/features/0040-Do-not-log-offline-mode-warning.patch b/leaf-server/minecraft-patches/features/0039-Do-not-log-offline-mode-warning.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0040-Do-not-log-offline-mode-warning.patch rename to leaf-server/minecraft-patches/features/0039-Do-not-log-offline-mode-warning.patch index 466f2567..bb7e4ba8 100644 --- a/leaf-server/minecraft-patches/features/0040-Do-not-log-offline-mode-warning.patch +++ b/leaf-server/minecraft-patches/features/0039-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/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index 083e0154ec373d5ebe18ecbe55c88e4407d61a81..cd266af35c7b8455af19adc9b0874cdd7572217f 100644 +index e7e4262981bcbf75a5c6a76f4588c91de15bf975..9c8d88e81ad9d06966bcec0ef134c8e658b9b51e 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -253,7 +253,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/leaf-server/minecraft-patches/features/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/leaf-server/minecraft-patches/features/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to leaf-server/minecraft-patches/features/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/leaf-server/minecraft-patches/features/0042-Fix-MC-238526.patch b/leaf-server/minecraft-patches/features/0041-Fix-MC-238526.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0042-Fix-MC-238526.patch rename to leaf-server/minecraft-patches/features/0041-Fix-MC-238526.patch diff --git a/leaf-server/minecraft-patches/features/0043-Fix-MC-121706.patch b/leaf-server/minecraft-patches/features/0042-Fix-MC-121706.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0043-Fix-MC-121706.patch rename to leaf-server/minecraft-patches/features/0042-Fix-MC-121706.patch diff --git a/leaf-server/minecraft-patches/features/0044-Make-arrow-movement-resetting-despawn-counter-config.patch b/leaf-server/minecraft-patches/features/0043-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0044-Make-arrow-movement-resetting-despawn-counter-config.patch rename to leaf-server/minecraft-patches/features/0043-Make-arrow-movement-resetting-despawn-counter-config.patch diff --git a/leaf-server/minecraft-patches/features/0045-Make-logging-login-locations-configurable.patch b/leaf-server/minecraft-patches/features/0044-Make-logging-login-locations-configurable.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0045-Make-logging-login-locations-configurable.patch rename to leaf-server/minecraft-patches/features/0044-Make-logging-login-locations-configurable.patch index 398ebf90..a90a2e55 100644 --- a/leaf-server/minecraft-patches/features/0045-Make-logging-login-locations-configurable.patch +++ b/leaf-server/minecraft-patches/features/0044-Make-logging-login-locations-configurable.patch @@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index d0b12d91686592149a8a3e33677eb2e26e19624e..2a536b1cc91725c6fc0724ed5507b68668b61660 100644 +index 0509c3b79a01a18ddb1a6ed41c1668ee5d3c50e7..f4a73d3f56d6a10493752653bd50c8caeda63a94 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -403,7 +403,13 @@ public abstract class PlayerList { diff --git a/leaf-server/minecraft-patches/features/0046-Reduce-array-allocations.patch b/leaf-server/minecraft-patches/features/0045-Reduce-array-allocations.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0046-Reduce-array-allocations.patch rename to leaf-server/minecraft-patches/features/0045-Reduce-array-allocations.patch index e40ec5f5..88535dee 100644 --- a/leaf-server/minecraft-patches/features/0046-Reduce-array-allocations.patch +++ b/leaf-server/minecraft-patches/features/0045-Reduce-array-allocations.patch @@ -231,7 +231,7 @@ index 3eea236bd1fd401fefdf7c5cc553a3db335029c7..3739272cbc73b7c4f15a2fbe874905cf if (!itemBySlot.isEmpty()) { newMob.setItemSlot(equipmentSlot, itemBySlot.copyAndClear()); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index c941e144667f04e8710da9dacc3f5e02731303bd..977198e485053847b051b9e9ae60c6d8be6600cc 100644 +index f22af336ac2949a91a6aebde6eaf4fef8545cb59..e81774a2fbcafb5909b966f71d31379c8b5a7426 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -3076,7 +3076,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -289,7 +289,7 @@ index b383836c200ca9f7bd84639367aa81b57868fb25..3af4a6dcc81afaf2860325fe5852c9a9 private static Map createForAllSlots(List equipmentSlots, float dropChance) { diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 395ebf0a5fa14d9ff43b2d2e8e63aeaaf4612443..c6f87ee9b7c2b0bfc2d459a86b60ad2eaa23b594 100644 +index 1b7d8a8838e9b75bc12ce4b9f30429110e9af913..82354cc62df5b7793ef13c6731d84457cee42092 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -3358,7 +3358,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0047-Optimize-sun-burn-tick.patch b/leaf-server/minecraft-patches/features/0046-Optimize-sun-burn-tick.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0047-Optimize-sun-burn-tick.patch rename to leaf-server/minecraft-patches/features/0046-Optimize-sun-burn-tick.patch index 738d759a..a59bd10f 100644 --- a/leaf-server/minecraft-patches/features/0047-Optimize-sun-burn-tick.patch +++ b/leaf-server/minecraft-patches/features/0046-Optimize-sun-burn-tick.patch @@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 977198e485053847b051b9e9ae60c6d8be6600cc..bb7be7cf6040aa7b5b28fb66f600c487d50019a6 100644 +index e81774a2fbcafb5909b966f71d31379c8b5a7426..229daac5767e8d65b2d0c37303d3490ef97e21ff 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -2087,10 +2087,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0048-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/leaf-server/minecraft-patches/features/0047-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0048-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to leaf-server/minecraft-patches/features/0047-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/leaf-server/minecraft-patches/features/0049-Replace-game-rules-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0048-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0049-Replace-game-rules-map-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0048-Replace-game-rules-map-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0050-Replace-AI-attributes-with-optimized-collections.patch b/leaf-server/minecraft-patches/features/0049-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0050-Replace-AI-attributes-with-optimized-collections.patch rename to leaf-server/minecraft-patches/features/0049-Replace-AI-attributes-with-optimized-collections.patch diff --git a/leaf-server/minecraft-patches/features/0051-Replace-throttle-tracker-map-with-optimized-collecti.patch b/leaf-server/minecraft-patches/features/0050-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0051-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to leaf-server/minecraft-patches/features/0050-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/leaf-server/minecraft-patches/features/0052-Cache-FluidOcclusionCacheKey-hash.patch b/leaf-server/minecraft-patches/features/0051-Cache-FluidOcclusionCacheKey-hash.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0052-Cache-FluidOcclusionCacheKey-hash.patch rename to leaf-server/minecraft-patches/features/0051-Cache-FluidOcclusionCacheKey-hash.patch diff --git a/leaf-server/minecraft-patches/features/0053-Cache-ShapePairKey-hash.patch b/leaf-server/minecraft-patches/features/0052-Cache-ShapePairKey-hash.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0053-Cache-ShapePairKey-hash.patch rename to leaf-server/minecraft-patches/features/0052-Cache-ShapePairKey-hash.patch diff --git a/leaf-server/minecraft-patches/features/0054-Replace-division-by-multiplication-in-CubePointRange.patch b/leaf-server/minecraft-patches/features/0053-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0054-Replace-division-by-multiplication-in-CubePointRange.patch rename to leaf-server/minecraft-patches/features/0053-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/leaf-server/minecraft-patches/features/0055-Replace-parts-by-size-in-CubePointRange.patch b/leaf-server/minecraft-patches/features/0054-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0055-Replace-parts-by-size-in-CubePointRange.patch rename to leaf-server/minecraft-patches/features/0054-Replace-parts-by-size-in-CubePointRange.patch diff --git a/leaf-server/minecraft-patches/features/0056-Check-frozen-ticks-before-landing-block.patch b/leaf-server/minecraft-patches/features/0055-Check-frozen-ticks-before-landing-block.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0056-Check-frozen-ticks-before-landing-block.patch rename to leaf-server/minecraft-patches/features/0055-Check-frozen-ticks-before-landing-block.patch index 2543e2ac..362bd5ec 100644 --- a/leaf-server/minecraft-patches/features/0056-Check-frozen-ticks-before-landing-block.patch +++ b/leaf-server/minecraft-patches/features/0055-Check-frozen-ticks-before-landing-block.patch @@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index dc7d53e93a49297e3a5e1204025b3a50e73fba4e..586b79bc844b098336c6d3bf342b570396e6af88 100644 +index 82354cc62df5b7793ef13c6731d84457cee42092..55277151febdf464e0a4679336a1464d3e4069b8 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -535,10 +535,9 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0057-Faster-chunk-serialization.patch b/leaf-server/minecraft-patches/features/0056-Faster-chunk-serialization.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0057-Faster-chunk-serialization.patch rename to leaf-server/minecraft-patches/features/0056-Faster-chunk-serialization.patch index 9340048a..9e0eeba0 100644 --- a/leaf-server/minecraft-patches/features/0057-Faster-chunk-serialization.patch +++ b/leaf-server/minecraft-patches/features/0056-Faster-chunk-serialization.patch @@ -88,7 +88,7 @@ index 5c1103ef028e5ffe6ce0eadc861dd3b2c8f3ed9f..828ced8aa5665c6f5d0b121947719c4e + @Override public void compact(net.minecraft.world.level.chunk.Palette srcPalette, net.minecraft.world.level.chunk.Palette dstPalette, short[] out) {} // Gale - Lithium - faster chunk serialization } diff --git a/net/minecraft/world/level/chunk/PalettedContainer.java b/net/minecraft/world/level/chunk/PalettedContainer.java -index a251ba67644cd02a0b00d7c8b0e2c64aa5e26291..59d48e7dc0911557c57a7e07f5f9013c010165bd 100644 +index a251ba67644cd02a0b00d7c8b0e2c64aa5e26291..49220967392331dd9928a539da6e6052b007e318 100644 --- a/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/net/minecraft/world/level/chunk/PalettedContainer.java @@ -24,6 +24,22 @@ import net.minecraft.util.ThreadingDetector; diff --git a/leaf-server/minecraft-patches/features/0058-Update-boss-bar-within-tick.patch b/leaf-server/minecraft-patches/features/0057-Update-boss-bar-within-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0058-Update-boss-bar-within-tick.patch rename to leaf-server/minecraft-patches/features/0057-Update-boss-bar-within-tick.patch diff --git a/leaf-server/minecraft-patches/features/0059-Skip-secondary-POI-sensor-if-absent.patch b/leaf-server/minecraft-patches/features/0058-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0059-Skip-secondary-POI-sensor-if-absent.patch rename to leaf-server/minecraft-patches/features/0058-Skip-secondary-POI-sensor-if-absent.patch diff --git a/leaf-server/minecraft-patches/features/0060-Skip-entity-move-if-movement-is-zero.patch b/leaf-server/minecraft-patches/features/0059-Skip-entity-move-if-movement-is-zero.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0060-Skip-entity-move-if-movement-is-zero.patch rename to leaf-server/minecraft-patches/features/0059-Skip-entity-move-if-movement-is-zero.patch index 5ef91568..abfc4a48 100644 --- a/leaf-server/minecraft-patches/features/0060-Skip-entity-move-if-movement-is-zero.patch +++ b/leaf-server/minecraft-patches/features/0059-Skip-entity-move-if-movement-is-zero.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/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index ab6abe703c3df6908c8001fc81efe2dca062eba1..9b81d49b6a6a93019100416c21ba8c732203395e 100644 +index 229daac5767e8d65b2d0c37303d3490ef97e21ff..6a4eaccf82e4d94dad657318e307a24d1ce2b9c1 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -260,6 +260,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0061-Store-mob-counts-in-an-array.patch b/leaf-server/minecraft-patches/features/0060-Store-mob-counts-in-an-array.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0061-Store-mob-counts-in-an-array.patch rename to leaf-server/minecraft-patches/features/0060-Store-mob-counts-in-an-array.patch diff --git a/leaf-server/minecraft-patches/features/0062-Use-linked-map-for-entity-trackers.patch b/leaf-server/minecraft-patches/features/0061-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0062-Use-linked-map-for-entity-trackers.patch rename to leaf-server/minecraft-patches/features/0061-Use-linked-map-for-entity-trackers.patch diff --git a/leaf-server/minecraft-patches/features/0063-Optimize-noise-generation.patch b/leaf-server/minecraft-patches/features/0062-Optimize-noise-generation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0063-Optimize-noise-generation.patch rename to leaf-server/minecraft-patches/features/0062-Optimize-noise-generation.patch diff --git a/leaf-server/minecraft-patches/features/0064-Optimize-sheep-offspring-color.patch b/leaf-server/minecraft-patches/features/0063-Optimize-sheep-offspring-color.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0064-Optimize-sheep-offspring-color.patch rename to leaf-server/minecraft-patches/features/0063-Optimize-sheep-offspring-color.patch diff --git a/leaf-server/minecraft-patches/features/0065-Hide-flames-on-entities-with-fire-resistance.patch b/leaf-server/minecraft-patches/features/0064-Hide-flames-on-entities-with-fire-resistance.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0065-Hide-flames-on-entities-with-fire-resistance.patch rename to leaf-server/minecraft-patches/features/0064-Hide-flames-on-entities-with-fire-resistance.patch index 9a1701d0..39db93f0 100644 --- a/leaf-server/minecraft-patches/features/0065-Hide-flames-on-entities-with-fire-resistance.patch +++ b/leaf-server/minecraft-patches/features/0064-Hide-flames-on-entities-with-fire-resistance.patch @@ -13,7 +13,7 @@ As part of: Slice (https://github.com/Cryptite/Slice) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 0c0ef8705a8a2f7e96c84f380a43fdc48abdb1e3..8fcc1223942114f46c36028326e9c7daf4f0d9e0 100644 +index 6a4eaccf82e4d94dad657318e307a24d1ce2b9c1..c845bea5d31296efa03d07e5133e988ef3c57808 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -886,7 +886,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0066-Skip-cloning-advancement-criteria.patch b/leaf-server/minecraft-patches/features/0065-Skip-cloning-advancement-criteria.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0066-Skip-cloning-advancement-criteria.patch rename to leaf-server/minecraft-patches/features/0065-Skip-cloning-advancement-criteria.patch diff --git a/leaf-server/minecraft-patches/features/0067-Reduce-block-destruction-packet-allocations.patch b/leaf-server/minecraft-patches/features/0066-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0067-Reduce-block-destruction-packet-allocations.patch rename to leaf-server/minecraft-patches/features/0066-Reduce-block-destruction-packet-allocations.patch diff --git a/leaf-server/minecraft-patches/features/0068-Spread-out-sending-all-player-info.patch b/leaf-server/minecraft-patches/features/0067-Spread-out-sending-all-player-info.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0068-Spread-out-sending-all-player-info.patch rename to leaf-server/minecraft-patches/features/0067-Spread-out-sending-all-player-info.patch diff --git a/leaf-server/minecraft-patches/features/0069-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/leaf-server/minecraft-patches/features/0068-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0069-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to leaf-server/minecraft-patches/features/0068-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/leaf-server/minecraft-patches/features/0070-Send-multiple-keep-alive-packets.patch b/leaf-server/minecraft-patches/features/0069-Send-multiple-keep-alive-packets.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0070-Send-multiple-keep-alive-packets.patch rename to leaf-server/minecraft-patches/features/0069-Send-multiple-keep-alive-packets.patch index 11f8b4d4..4d83a2aa 100644 --- a/leaf-server/minecraft-patches/features/0070-Send-multiple-keep-alive-packets.patch +++ b/leaf-server/minecraft-patches/features/0069-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/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 5e7f2c9bc266074aa661a8f8fe38bf311150fc4a..de630a692291926c52a0947f9943e59433ab130a 100644 +index 149660c1196481275ca03830d64cf33b5ce98163..37de0c46b065851ea0f0d01e415980e47cc3cfb5 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -38,10 +38,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack diff --git a/leaf-server/minecraft-patches/features/0071-Make-slow-login-timeout-configurable.patch b/leaf-server/minecraft-patches/features/0070-Make-slow-login-timeout-configurable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0071-Make-slow-login-timeout-configurable.patch rename to leaf-server/minecraft-patches/features/0070-Make-slow-login-timeout-configurable.patch diff --git a/leaf-server/minecraft-patches/features/0072-Don-t-load-chunks-to-spawn-phantoms.patch b/leaf-server/minecraft-patches/features/0071-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0072-Don-t-load-chunks-to-spawn-phantoms.patch rename to leaf-server/minecraft-patches/features/0071-Don-t-load-chunks-to-spawn-phantoms.patch index b89ab27e..458214b2 100644 --- a/leaf-server/minecraft-patches/features/0072-Don-t-load-chunks-to-spawn-phantoms.patch +++ b/leaf-server/minecraft-patches/features/0071-Don-t-load-chunks-to-spawn-phantoms.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/net/minecraft/world/level/levelgen/PhantomSpawner.java b/net/minecraft/world/level/levelgen/PhantomSpawner.java -index d2e674b046bcf82a239b4706c3b89197ec6749c8..07231d39357b4a58a22a17d6e965c4d611aff6a6 100644 +index b3cfab9c82fe12694f5d2f56bd922828e51df680..77ecbcdec8e176b1a45e87d33f64b1a12c532e26 100644 --- a/net/minecraft/world/level/levelgen/PhantomSpawner.java +++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java @@ -52,8 +52,16 @@ public class PhantomSpawner implements CustomSpawner { diff --git a/leaf-server/minecraft-patches/features/0073-Don-t-load-chunks-to-activate-climbing-entities.patch b/leaf-server/minecraft-patches/features/0072-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0073-Don-t-load-chunks-to-activate-climbing-entities.patch rename to leaf-server/minecraft-patches/features/0072-Don-t-load-chunks-to-activate-climbing-entities.patch index ccca986e..c12846c5 100644 --- a/leaf-server/minecraft-patches/features/0073-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/leaf-server/minecraft-patches/features/0072-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index b5b3b705cd23aa3e71c09ab92ed7b446e42a6dca..e42938238c798db6fe2e71eec9afb5d8e28fd6cb 100644 +index c845bea5d31296efa03d07e5133e988ef3c57808..515bc3de097bf9edda42584e56fa173727455b5a 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -4873,6 +4873,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -28,7 +28,7 @@ index b5b3b705cd23aa3e71c09ab92ed7b446e42a6dca..e42938238c798db6fe2e71eec9afb5d8 return this.chunkPosition; } diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index a8cc23bf13883bd85209e7ae280e476e01a452a9..d20bba53f8616e5093babad0c52d2e4f9b3401f7 100644 +index 55277151febdf464e0a4679336a1464d3e4069b8..d54c09c48edbfc999abd834b68ea5ceea13f39d2 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -2129,8 +2129,17 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0074-Broadcast-crit-animations-as-the-entity-being-critte.patch b/leaf-server/minecraft-patches/features/0073-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0074-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to leaf-server/minecraft-patches/features/0073-Broadcast-crit-animations-as-the-entity-being-critte.patch diff --git a/leaf-server/minecraft-patches/features/0075-Ignore-null-legacy-structure-data.patch b/leaf-server/minecraft-patches/features/0074-Ignore-null-legacy-structure-data.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0075-Ignore-null-legacy-structure-data.patch rename to leaf-server/minecraft-patches/features/0074-Ignore-null-legacy-structure-data.patch diff --git a/leaf-server/minecraft-patches/features/0076-Prevent-entities-random-strolling-into-non-ticking-c.patch b/leaf-server/minecraft-patches/features/0075-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0076-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to leaf-server/minecraft-patches/features/0075-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/leaf-server/minecraft-patches/features/0077-Do-not-place-player-in-world-if-kicked-before-being-.patch b/leaf-server/minecraft-patches/features/0076-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0077-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to leaf-server/minecraft-patches/features/0076-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/leaf-server/minecraft-patches/features/0078-Global-EULA-file.patch b/leaf-server/minecraft-patches/features/0077-Global-EULA-file.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0078-Global-EULA-file.patch rename to leaf-server/minecraft-patches/features/0077-Global-EULA-file.patch diff --git a/leaf-server/minecraft-patches/features/0079-5-second-TPS-average.patch b/leaf-server/minecraft-patches/features/0078-5-second-TPS-average.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0079-5-second-TPS-average.patch rename to leaf-server/minecraft-patches/features/0078-5-second-TPS-average.patch diff --git a/leaf-server/minecraft-patches/features/0080-Measure-last-tick-time.patch b/leaf-server/minecraft-patches/features/0079-Measure-last-tick-time.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0080-Measure-last-tick-time.patch rename to leaf-server/minecraft-patches/features/0079-Measure-last-tick-time.patch diff --git a/leaf-server/minecraft-patches/features/0081-Increase-time-statistics-in-intervals.patch b/leaf-server/minecraft-patches/features/0080-Increase-time-statistics-in-intervals.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0081-Increase-time-statistics-in-intervals.patch rename to leaf-server/minecraft-patches/features/0080-Increase-time-statistics-in-intervals.patch diff --git a/leaf-server/minecraft-patches/features/0082-For-collision-check-has-physics-before-same-vehicle.patch b/leaf-server/minecraft-patches/features/0081-For-collision-check-has-physics-before-same-vehicle.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0082-For-collision-check-has-physics-before-same-vehicle.patch rename to leaf-server/minecraft-patches/features/0081-For-collision-check-has-physics-before-same-vehicle.patch index 6fb83a37..80c21b10 100644 --- a/leaf-server/minecraft-patches/features/0082-For-collision-check-has-physics-before-same-vehicle.patch +++ b/leaf-server/minecraft-patches/features/0081-For-collision-check-has-physics-before-same-vehicle.patch @@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index e42938238c798db6fe2e71eec9afb5d8e28fd6cb..0966cc6911d8b62ac82e42d17931ee614d11ea5a 100644 +index 515bc3de097bf9edda42584e56fa173727455b5a..9153d6d44d740e014579ebd7606fd2f3adbca844 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -2231,8 +2231,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0083-Skip-negligible-planar-movement-multiplication.patch b/leaf-server/minecraft-patches/features/0082-Skip-negligible-planar-movement-multiplication.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0083-Skip-negligible-planar-movement-multiplication.patch rename to leaf-server/minecraft-patches/features/0082-Skip-negligible-planar-movement-multiplication.patch index 275d37a2..f68f3ab2 100644 --- a/leaf-server/minecraft-patches/features/0083-Skip-negligible-planar-movement-multiplication.patch +++ b/leaf-server/minecraft-patches/features/0082-Skip-negligible-planar-movement-multiplication.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 0966cc6911d8b62ac82e42d17931ee614d11ea5a..85424913110a8a5e2059d767cf595a340e41ce37 100644 +index 9153d6d44d740e014579ebd7606fd2f3adbca844..479cb2a3135b86bf1ae5132f8ddfbfb59c85cafc 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1218,8 +1218,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0084-Optimize-matching-item-checks.patch b/leaf-server/minecraft-patches/features/0083-Optimize-matching-item-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0084-Optimize-matching-item-checks.patch rename to leaf-server/minecraft-patches/features/0083-Optimize-matching-item-checks.patch diff --git a/leaf-server/minecraft-patches/features/0085-Pre-compute-VarLong-sizes.patch b/leaf-server/minecraft-patches/features/0084-Pre-compute-VarLong-sizes.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0085-Pre-compute-VarLong-sizes.patch rename to leaf-server/minecraft-patches/features/0084-Pre-compute-VarLong-sizes.patch diff --git a/leaf-server/minecraft-patches/features/0086-Optimize-VarInt-write-and-VarLong-write.patch b/leaf-server/minecraft-patches/features/0085-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0086-Optimize-VarInt-write-and-VarLong-write.patch rename to leaf-server/minecraft-patches/features/0085-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/leaf-server/minecraft-patches/features/0087-Reduce-RandomSource-instances.patch b/leaf-server/minecraft-patches/features/0086-Reduce-RandomSource-instances.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0087-Reduce-RandomSource-instances.patch rename to leaf-server/minecraft-patches/features/0086-Reduce-RandomSource-instances.patch index a99996c0..9f9cdbb2 100644 --- a/leaf-server/minecraft-patches/features/0087-Reduce-RandomSource-instances.patch +++ b/leaf-server/minecraft-patches/features/0086-Reduce-RandomSource-instances.patch @@ -117,7 +117,7 @@ index c8b577a5d5f059aed368fa082bc4518cc2dbd0b0..ac5ab4ae88c8188635f5784a10002a6c @Override diff --git a/net/minecraft/world/level/dimension/end/EndDragonFight.java b/net/minecraft/world/level/dimension/end/EndDragonFight.java -index 8ccd40c70e150bd5a8d89818c229258642f2349e..75d7ea8e6d5c8c707444c0db644d54707ca6ef29 100644 +index 7f9bd256da15da915db1c45099572d9eb3286166..62ffb8e88b76f9765283d40d5ddcd9320063ca55 100644 --- a/net/minecraft/world/level/dimension/end/EndDragonFight.java +++ b/net/minecraft/world/level/dimension/end/EndDragonFight.java @@ -433,7 +433,7 @@ public class EndDragonFight { diff --git a/leaf-server/minecraft-patches/features/0088-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/leaf-server/minecraft-patches/features/0087-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0088-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch rename to leaf-server/minecraft-patches/features/0087-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch index 605fcd73..2a906a70 100644 --- a/leaf-server/minecraft-patches/features/0088-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch +++ b/leaf-server/minecraft-patches/features/0087-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch @@ -18,7 +18,7 @@ this patch is focused around the sensors used for ai delete the line of sight cache less often and use a faster nearby comparison diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index d20bba53f8616e5093babad0c52d2e4f9b3401f7..da46c16d9ce8c66ce02133d74b2a41f375398528 100644 +index d54c09c48edbfc999abd834b68ea5ceea13f39d2..66e248f348731318590ebd3bd070b7fddf5f0379 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -1033,15 +1033,16 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0089-Initialize-line-of-sight-cache-with-low-capacity.patch b/leaf-server/minecraft-patches/features/0088-Initialize-line-of-sight-cache-with-low-capacity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0089-Initialize-line-of-sight-cache-with-low-capacity.patch rename to leaf-server/minecraft-patches/features/0088-Initialize-line-of-sight-cache-with-low-capacity.patch diff --git a/leaf-server/minecraft-patches/features/0090-Reduce-line-of-sight-updates-and-cache-lookups.patch b/leaf-server/minecraft-patches/features/0089-Reduce-line-of-sight-updates-and-cache-lookups.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0090-Reduce-line-of-sight-updates-and-cache-lookups.patch rename to leaf-server/minecraft-patches/features/0089-Reduce-line-of-sight-updates-and-cache-lookups.patch diff --git a/leaf-server/minecraft-patches/features/0091-Pufferfish-Optimize-mob-spawning.patch b/leaf-server/minecraft-patches/features/0090-Pufferfish-Optimize-mob-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0091-Pufferfish-Optimize-mob-spawning.patch rename to leaf-server/minecraft-patches/features/0090-Pufferfish-Optimize-mob-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0092-Pufferfish-Dynamic-Activation-of-Brain.patch b/leaf-server/minecraft-patches/features/0091-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0092-Pufferfish-Dynamic-Activation-of-Brain.patch rename to leaf-server/minecraft-patches/features/0091-Pufferfish-Dynamic-Activation-of-Brain.patch index 60c1e20d..7b3ca05e 100644 --- a/leaf-server/minecraft-patches/features/0092-Pufferfish-Dynamic-Activation-of-Brain.patch +++ b/leaf-server/minecraft-patches/features/0091-Pufferfish-Dynamic-Activation-of-Brain.patch @@ -83,7 +83,7 @@ index ad114ca013e0d09d40755acbe916586868a519ed..3f70fca36f67fa421314ff92d372a971 if (!tickRateManager.isEntityFrozen(entity)) { entity.checkDespawn(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 85424913110a8a5e2059d767cf595a340e41ce37..a8fd1554acbe14ac74cba718ceddc9f65057bcc7 100644 +index 479cb2a3135b86bf1ae5132f8ddfbfb59c85cafc..1d2d06db06c6a44204a647822b1a2812567f64d9 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -364,6 +364,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch b/leaf-server/minecraft-patches/features/0092-Purpur-Server-Minecraft-Changes.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch rename to leaf-server/minecraft-patches/features/0092-Purpur-Server-Minecraft-Changes.patch index a119e245..bf73afa8 100644 --- a/leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch +++ b/leaf-server/minecraft-patches/features/0092-Purpur-Server-Minecraft-Changes.patch @@ -1285,7 +1285,7 @@ index cfbf34964288526e93d0a5b212c1b60296c10430..d638821595138ef972163925136eb572 + // Purpur end - Shift right click to use exp for mending } diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index fa11f06db33efe7284e6e5dca9a3d460abb3a079..9af8f731bd583c46b93336b635ba9a5cea7e1ff3 100644 +index 37de0c46b065851ea0f0d01e415980e47cc3cfb5..c5ed0843fdcb066d7fa0aa3075796333862ad923 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -56,6 +56,10 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -2324,7 +2324,7 @@ index aab9adb8313c4b18279c7fd7500ef04bda09c6c1..86a694b94045b47f6e98c480645f7573 protected ParticleOptions getInkParticle() { return ParticleTypes.GLOW_SQUID_INK; diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index da46c16d9ce8c66ce02133d74b2a41f375398528..d79bb361783082ec2aaafdc1b2e6bb4d51813666 100644 +index 66e248f348731318590ebd3bd070b7fddf5f0379..fa5010a42970741b930fddedf11527216c8f9173 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -236,9 +236,9 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin @@ -2659,7 +2659,7 @@ index da46c16d9ce8c66ce02133d74b2a41f375398528..d79bb361783082ec2aaafdc1b2e6bb4d } this.gameEvent(GameEvent.ELYTRA_GLIDE); -@@ -4524,6 +4655,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -4540,6 +4671,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin : slot == equippable.slot() && this.canUseSlot(equippable.slot()) && equippable.canBeEquippedBy(this.getType()); } @@ -2947,10 +2947,10 @@ index a87accd5fe14102e7a2938f991a8ed0b9accd1bb..c7515f7f24e39d6931dcf18574cb47d7 } } diff --git a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -index 751e91a922b20c96f27885c3eb085ec4ae39091b..7f0975f8bd6d5f8ca28f503f93c8cb5c42557420 100644 +index 57befff1f0675e889304a6258258384d8de02c87..b0ca555cc3b565a8be8d01fe10b139ed27a2a2c3 100644 --- a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +++ b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -@@ -94,7 +94,7 @@ public class AcquirePoi { +@@ -86,7 +86,7 @@ public class AcquirePoi { }; // Paper start - optimise POI access final java.util.List, BlockPos>> poiposes = new java.util.ArrayList<>(); @@ -3225,7 +3225,7 @@ index 6eaf0bd944349cd0c6084462ac385fa2caafe933..be59d0c27a83b329ec3f97c029cfb9c1 double d = this.llama.distanceToSqr(this.llama.getCaravanHead()); if (d > 676.0) { diff --git a/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java b/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java -index 5d025e0e4381a045fd82c26cdd3907e1a8710b45..16ec032d84f128fc44a836843fafef303f52b699 100644 +index 3d40911970caf6f1de2a1ebee1df4c077703226a..179597558e93c6e9172207f716f9294de3926c49 100644 --- a/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java +++ b/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java @@ -35,7 +35,7 @@ public class RemoveBlockGoal extends MoveToBlockGoal { @@ -14407,7 +14407,7 @@ index 92a2a9c84d8f0a44dffee22834f5ae6c6b4fec43..e2cdb3d43eca6e0e52fb00fbf3801f4b if (event.callEvent() && thrownPotion.attemptSpawn()) { if (event.shouldConsume()) { diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java -index fac4c58ea5d467a8686e42676e2323fbddeb8c7b..7fe10d298a1204d87c0484f97f3767de6779c687 100644 +index 2c38f40e87e711942c41c0740fbb2b4080ab9bcf..3e2c23968087e8c60051059720edc3259c44bfa8 100644 --- a/net/minecraft/world/item/TridentItem.java +++ b/net/minecraft/world/item/TridentItem.java @@ -83,7 +83,7 @@ public class TridentItem extends Item implements ProjectileItem { @@ -14430,7 +14430,7 @@ index fac4c58ea5d467a8686e42676e2323fbddeb8c7b..7fe10d298a1204d87c0484f97f3767de @@ -125,6 +126,18 @@ public class TridentItem extends Item implements ProjectileItem { f1 *= tridentSpinAttackStrength / squareRoot; f2 *= tridentSpinAttackStrength / squareRoot; - org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerRiptideEvent(player, stack, f, f1, f2); // CraftBukkit + if (!org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerRiptideEvent(player, stack, f, f1, f2)) return false; // Paper - Add player riptide event + + // Purpur start - Implement elytra settings + List list = net.minecraft.world.entity.EquipmentSlot.VALUES.stream().filter((enumitemslot) -> LivingEntity.canGlideUsing(entity.getItemBySlot(enumitemslot), enumitemslot)).toList(); @@ -16694,7 +16694,7 @@ index 04527a5c65ad630f794fed9071d485aedd02257a..77731406cb3dc417aa2fe1cb4352f3d2 NoiseCache cache = noiseCache.get().computeIfAbsent(noise, noiseKey -> new NoiseCache()); // Paper - Perf: Optimize end generation diff --git a/net/minecraft/world/level/levelgen/PhantomSpawner.java b/net/minecraft/world/level/levelgen/PhantomSpawner.java -index 07231d39357b4a58a22a17d6e965c4d611aff6a6..2b869b00b9512f7705b82062742635cc348c01aa 100644 +index 77ecbcdec8e176b1a45e87d33f64b1a12c532e26..acd3161d88a22a4f6246321cb2af9195e416f94c 100644 --- a/net/minecraft/world/level/levelgen/PhantomSpawner.java +++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java @@ -38,13 +38,13 @@ public class PhantomSpawner implements CustomSpawner { diff --git a/leaf-server/minecraft-patches/features/0094-Fix-Pufferfish-and-Purpur-patches.patch b/leaf-server/minecraft-patches/features/0093-Fix-Pufferfish-and-Purpur-patches.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0094-Fix-Pufferfish-and-Purpur-patches.patch rename to leaf-server/minecraft-patches/features/0093-Fix-Pufferfish-and-Purpur-patches.patch index 7468e624..db2ba094 100644 --- a/leaf-server/minecraft-patches/features/0094-Fix-Pufferfish-and-Purpur-patches.patch +++ b/leaf-server/minecraft-patches/features/0093-Fix-Pufferfish-and-Purpur-patches.patch @@ -128,7 +128,7 @@ index 98f9a1378c6cef93adb431730972d6b05c14b121..4a1cfd5247073bd57f88151425ea1c86 public Entity(EntityType entityType, Level level) { this.type = entityType; diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index d79bb361783082ec2aaafdc1b2e6bb4d51813666..f712d4445d8ffdc8dbd5f51c2a8104b097df11d1 100644 +index fa5010a42970741b930fddedf11527216c8f9173..5aa749c46b0b84dfe1584788617e0f184e850239 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -1049,13 +1049,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0095-Purpur-Configurable-server-mod-name.patch b/leaf-server/minecraft-patches/features/0094-Purpur-Configurable-server-mod-name.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0095-Purpur-Configurable-server-mod-name.patch rename to leaf-server/minecraft-patches/features/0094-Purpur-Configurable-server-mod-name.patch diff --git a/leaf-server/minecraft-patches/features/0096-Configurable-server-GUI-name.patch b/leaf-server/minecraft-patches/features/0095-Configurable-server-GUI-name.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0096-Configurable-server-GUI-name.patch rename to leaf-server/minecraft-patches/features/0095-Configurable-server-GUI-name.patch diff --git a/leaf-server/minecraft-patches/features/0097-Remove-vanilla-username-check.patch b/leaf-server/minecraft-patches/features/0096-Remove-vanilla-username-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0097-Remove-vanilla-username-check.patch rename to leaf-server/minecraft-patches/features/0096-Remove-vanilla-username-check.patch diff --git a/leaf-server/minecraft-patches/features/0098-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch b/leaf-server/minecraft-patches/features/0097-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0098-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch rename to leaf-server/minecraft-patches/features/0097-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch diff --git a/leaf-server/minecraft-patches/features/0099-Remove-UseItemOnPacket-Too-Far-check.patch b/leaf-server/minecraft-patches/features/0098-Remove-UseItemOnPacket-Too-Far-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0099-Remove-UseItemOnPacket-Too-Far-check.patch rename to leaf-server/minecraft-patches/features/0098-Remove-UseItemOnPacket-Too-Far-check.patch diff --git a/leaf-server/minecraft-patches/features/0100-Remove-change-non-editable-sign-warning.patch b/leaf-server/minecraft-patches/features/0099-Remove-change-non-editable-sign-warning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0100-Remove-change-non-editable-sign-warning.patch rename to leaf-server/minecraft-patches/features/0099-Remove-change-non-editable-sign-warning.patch diff --git a/leaf-server/minecraft-patches/features/0101-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch b/leaf-server/minecraft-patches/features/0100-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0101-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch rename to leaf-server/minecraft-patches/features/0100-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch diff --git a/leaf-server/minecraft-patches/features/0102-Carpet-Fixes-Optimized-getBiome-method.patch b/leaf-server/minecraft-patches/features/0101-Carpet-Fixes-Optimized-getBiome-method.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0102-Carpet-Fixes-Optimized-getBiome-method.patch rename to leaf-server/minecraft-patches/features/0101-Carpet-Fixes-Optimized-getBiome-method.patch diff --git a/leaf-server/minecraft-patches/features/0103-Carpet-Fixes-Use-optimized-RecipeManager.patch b/leaf-server/minecraft-patches/features/0102-Carpet-Fixes-Use-optimized-RecipeManager.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0103-Carpet-Fixes-Use-optimized-RecipeManager.patch rename to leaf-server/minecraft-patches/features/0102-Carpet-Fixes-Use-optimized-RecipeManager.patch diff --git a/leaf-server/minecraft-patches/features/0104-Akarin-Save-Json-list-asynchronously.patch b/leaf-server/minecraft-patches/features/0103-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0104-Akarin-Save-Json-list-asynchronously.patch rename to leaf-server/minecraft-patches/features/0103-Akarin-Save-Json-list-asynchronously.patch diff --git a/leaf-server/minecraft-patches/features/0105-Slice-Smooth-Teleports.patch b/leaf-server/minecraft-patches/features/0104-Slice-Smooth-Teleports.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0105-Slice-Smooth-Teleports.patch rename to leaf-server/minecraft-patches/features/0104-Slice-Smooth-Teleports.patch diff --git a/leaf-server/minecraft-patches/features/0106-Parchment-Make-FixLight-use-action-bar.patch b/leaf-server/minecraft-patches/features/0105-Parchment-Make-FixLight-use-action-bar.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0106-Parchment-Make-FixLight-use-action-bar.patch rename to leaf-server/minecraft-patches/features/0105-Parchment-Make-FixLight-use-action-bar.patch diff --git a/leaf-server/minecraft-patches/features/0107-Leaves-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0106-Leaves-Protocol-Core.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0107-Leaves-Protocol-Core.patch rename to leaf-server/minecraft-patches/features/0106-Leaves-Protocol-Core.patch index a4e45aa5..45e3054d 100644 --- a/leaf-server/minecraft-patches/features/0107-Leaves-Protocol-Core.patch +++ b/leaf-server/minecraft-patches/features/0106-Leaves-Protocol-Core.patch @@ -50,7 +50,7 @@ index 7b4437c06c2ede0be7dd58b42863e88b4b205106..73c63330b67b3d16ceebc644ce177980 this.tickables.get(i).run(); } diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 9af8f731bd583c46b93336b635ba9a5cea7e1ff3..82c22ca54cc7c8371b744c93f133dfc2b798195b 100644 +index c5ed0843fdcb066d7fa0aa3075796333862ad923..c04772c15842a07e57d28a979bdceb1fe7547d61 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -64,6 +64,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack diff --git a/leaf-server/minecraft-patches/features/0108-Leaves-Jade-Protocol.patch b/leaf-server/minecraft-patches/features/0107-Leaves-Jade-Protocol.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0108-Leaves-Jade-Protocol.patch rename to leaf-server/minecraft-patches/features/0107-Leaves-Jade-Protocol.patch diff --git a/leaf-server/minecraft-patches/features/0109-Leaves-Xaero-Map-Protocol.patch b/leaf-server/minecraft-patches/features/0108-Leaves-Xaero-Map-Protocol.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0109-Leaves-Xaero-Map-Protocol.patch rename to leaf-server/minecraft-patches/features/0108-Leaves-Xaero-Map-Protocol.patch diff --git a/leaf-server/minecraft-patches/features/0110-Leaves-Syncmatica-Protocol.patch b/leaf-server/minecraft-patches/features/0109-Leaves-Syncmatica-Protocol.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0110-Leaves-Syncmatica-Protocol.patch rename to leaf-server/minecraft-patches/features/0109-Leaves-Syncmatica-Protocol.patch diff --git a/leaf-server/minecraft-patches/features/0111-Leaves-Replay-Mod-API.patch b/leaf-server/minecraft-patches/features/0110-Leaves-Replay-Mod-API.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0111-Leaves-Replay-Mod-API.patch rename to leaf-server/minecraft-patches/features/0110-Leaves-Replay-Mod-API.patch diff --git a/leaf-server/minecraft-patches/features/0112-Petal-Async-Pathfinding.patch b/leaf-server/minecraft-patches/features/0111-Petal-Async-Pathfinding.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0112-Petal-Async-Pathfinding.patch rename to leaf-server/minecraft-patches/features/0111-Petal-Async-Pathfinding.patch index c53427e2..cf4d5ad4 100644 --- a/leaf-server/minecraft-patches/features/0112-Petal-Async-Pathfinding.patch +++ b/leaf-server/minecraft-patches/features/0111-Petal-Async-Pathfinding.patch @@ -31,10 +31,10 @@ index 26db3eb9dfc3d9c0c7efa4cf25827f15c37a7775..e5a93f7256d904a3401a68ca8ad5962d } diff --git a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -index 7f0975f8bd6d5f8ca28f503f93c8cb5c42557420..698d7a690f012da87295f0d9035dc0e5f0626fcc 100644 +index b0ca555cc3b565a8be8d01fe10b139ed27a2a2c3..3dac0c3b52bb979d402924ce3a8bae3e26a3c151 100644 --- a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +++ b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -@@ -102,21 +102,20 @@ public class AcquirePoi { +@@ -94,21 +94,20 @@ public class AcquirePoi { } } // Paper end - optimise POI access @@ -67,7 +67,7 @@ index 7f0975f8bd6d5f8ca28f503f93c8cb5c42557420..698d7a690f012da87295f0d9035dc0e5 return true; } -@@ -128,6 +127,34 @@ public class AcquirePoi { +@@ -120,6 +119,34 @@ public class AcquirePoi { : BehaviorBuilder.create(instance -> instance.group(instance.absent(existingAbsentMemory)).apply(instance, memoryAccessor -> oneShot)); } diff --git a/leaf-server/minecraft-patches/features/0113-Petal-reduce-work-done-by-game-event-system.patch b/leaf-server/minecraft-patches/features/0112-Petal-reduce-work-done-by-game-event-system.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0113-Petal-reduce-work-done-by-game-event-system.patch rename to leaf-server/minecraft-patches/features/0112-Petal-reduce-work-done-by-game-event-system.patch diff --git a/leaf-server/minecraft-patches/features/0114-Reduce-canSee-work.patch b/leaf-server/minecraft-patches/features/0113-Reduce-canSee-work.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0114-Reduce-canSee-work.patch rename to leaf-server/minecraft-patches/features/0113-Reduce-canSee-work.patch diff --git a/leaf-server/minecraft-patches/features/0115-Fix-sprint-glitch.patch b/leaf-server/minecraft-patches/features/0114-Fix-sprint-glitch.patch similarity index 90% rename from leaf-server/minecraft-patches/features/0115-Fix-sprint-glitch.patch rename to leaf-server/minecraft-patches/features/0114-Fix-sprint-glitch.patch index c647dd79..6cb20fe3 100644 --- a/leaf-server/minecraft-patches/features/0115-Fix-sprint-glitch.patch +++ b/leaf-server/minecraft-patches/features/0114-Fix-sprint-glitch.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix sprint glitch diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index f712d4445d8ffdc8dbd5f51c2a8104b097df11d1..199d97ceb0cbb87a9ed88d2f34da144539d11d4c 100644 +index 5aa749c46b0b84dfe1584788617e0f184e850239..1ba42eaaf9ceb41c5ef184f3002135c0781abe33 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -1419,7 +1419,8 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0116-Configurable-movement-speed-of-more-entities.patch b/leaf-server/minecraft-patches/features/0115-Configurable-movement-speed-of-more-entities.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0116-Configurable-movement-speed-of-more-entities.patch rename to leaf-server/minecraft-patches/features/0115-Configurable-movement-speed-of-more-entities.patch diff --git a/leaf-server/minecraft-patches/features/0117-Faster-sequencing-of-futures-for-chunk-structure-gen.patch b/leaf-server/minecraft-patches/features/0116-Faster-sequencing-of-futures-for-chunk-structure-gen.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0117-Faster-sequencing-of-futures-for-chunk-structure-gen.patch rename to leaf-server/minecraft-patches/features/0116-Faster-sequencing-of-futures-for-chunk-structure-gen.patch diff --git a/leaf-server/minecraft-patches/features/0118-Reduce-active-items-finding-hopper-nearby-check.patch b/leaf-server/minecraft-patches/features/0117-Reduce-active-items-finding-hopper-nearby-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0118-Reduce-active-items-finding-hopper-nearby-check.patch rename to leaf-server/minecraft-patches/features/0117-Reduce-active-items-finding-hopper-nearby-check.patch diff --git a/leaf-server/minecraft-patches/features/0119-Plazma-Add-some-missing-Pufferfish-configurations.patch b/leaf-server/minecraft-patches/features/0118-Plazma-Add-some-missing-Pufferfish-configurations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0119-Plazma-Add-some-missing-Pufferfish-configurations.patch rename to leaf-server/minecraft-patches/features/0118-Plazma-Add-some-missing-Pufferfish-configurations.patch diff --git a/leaf-server/minecraft-patches/features/0120-Plazma-Add-missing-purpur-configuration-options.patch b/leaf-server/minecraft-patches/features/0119-Plazma-Add-missing-purpur-configuration-options.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0120-Plazma-Add-missing-purpur-configuration-options.patch rename to leaf-server/minecraft-patches/features/0119-Plazma-Add-missing-purpur-configuration-options.patch diff --git a/leaf-server/minecraft-patches/features/0121-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/leaf-server/minecraft-patches/features/0120-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0121-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to leaf-server/minecraft-patches/features/0120-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/leaf-server/minecraft-patches/features/0122-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/leaf-server/minecraft-patches/features/0121-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0122-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to leaf-server/minecraft-patches/features/0121-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/leaf-server/minecraft-patches/features/0123-SparklyPaper-Optimize-canSee-checks.patch b/leaf-server/minecraft-patches/features/0122-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0123-SparklyPaper-Optimize-canSee-checks.patch rename to leaf-server/minecraft-patches/features/0122-SparklyPaper-Optimize-canSee-checks.patch diff --git a/leaf-server/minecraft-patches/features/0124-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch b/leaf-server/minecraft-patches/features/0123-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch similarity index 93% rename from leaf-server/minecraft-patches/features/0124-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch rename to leaf-server/minecraft-patches/features/0123-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch index 61118149..cd4e0043 100644 --- a/leaf-server/minecraft-patches/features/0124-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch +++ b/leaf-server/minecraft-patches/features/0123-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch @@ -7,7 +7,7 @@ Subject: [PATCH] SparklyPaper: Allow throttling hopper checks if the target Original project: https://github.com/SparklyPower/SparklyPaper diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 2a49f65a2ea13414099b636f463239ced4fbb5f6..9705149eee437ebca99687c47b294659b67375fe 100644 +index c1fcd9e0ab47332ce48e391c6cd1455960340df3..8dd751dfb0cffbfaa0ec2337faedc508412bd5af 100644 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -423,6 +423,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/leaf-server/minecraft-patches/features/0125-Polpot-Make-egg-and-snowball-can-knockback-player.patch b/leaf-server/minecraft-patches/features/0124-Polpot-Make-egg-and-snowball-can-knockback-player.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0125-Polpot-Make-egg-and-snowball-can-knockback-player.patch rename to leaf-server/minecraft-patches/features/0124-Polpot-Make-egg-and-snowball-can-knockback-player.patch diff --git a/leaf-server/minecraft-patches/features/0126-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch b/leaf-server/minecraft-patches/features/0125-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0126-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch rename to leaf-server/minecraft-patches/features/0125-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch diff --git a/leaf-server/minecraft-patches/features/0127-Remove-useless-creating-stats-json-bases-on-player-n.patch b/leaf-server/minecraft-patches/features/0126-Remove-useless-creating-stats-json-bases-on-player-n.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0127-Remove-useless-creating-stats-json-bases-on-player-n.patch rename to leaf-server/minecraft-patches/features/0126-Remove-useless-creating-stats-json-bases-on-player-n.patch diff --git a/leaf-server/minecraft-patches/features/0128-Improve-Purpur-AFK-system.patch b/leaf-server/minecraft-patches/features/0127-Improve-Purpur-AFK-system.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0128-Improve-Purpur-AFK-system.patch rename to leaf-server/minecraft-patches/features/0127-Improve-Purpur-AFK-system.patch diff --git a/leaf-server/minecraft-patches/features/0129-Virtual-thread-for-chat-executor.patch b/leaf-server/minecraft-patches/features/0128-Virtual-thread-for-chat-executor.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0129-Virtual-thread-for-chat-executor.patch rename to leaf-server/minecraft-patches/features/0128-Virtual-thread-for-chat-executor.patch index 27767023..0089ebf0 100644 --- a/leaf-server/minecraft-patches/features/0129-Virtual-thread-for-chat-executor.patch +++ b/leaf-server/minecraft-patches/features/0128-Virtual-thread-for-chat-executor.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Virtual thread for chat executor diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 68b72a7461a89ba7bd29fc9bc98171fb7f990df8..efb281f71ef5404fa40b7d04104b1c15d14e2c05 100644 +index 688e6684f6e0890dda8124b85b24a3da8c5b3292..d6f3fb64412af8194c2cef44977e241627c6a3be 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -2649,7 +2649,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop attribute) { diff --git a/net/minecraft/world/entity/ai/attributes/Attribute.java b/net/minecraft/world/entity/ai/attributes/Attribute.java -index f8419dde44ebc7324e783f8bee42132d5ec973c3..d7eef96e12c738cd06a8e16efe48b7673f2a8608 100644 +index 18563961e9dba1a11265c6ea708881d4e46846ff..0033ab86e312cac187a1e49aaf437868b5d37c77 100644 --- a/net/minecraft/world/entity/ai/attributes/Attribute.java +++ b/net/minecraft/world/entity/ai/attributes/Attribute.java @@ -16,10 +16,15 @@ public class Attribute { private boolean syncable; private final String descriptionId; - private Attribute.Sentiment sentiment = Attribute.Sentiment.POSITIVE; + public Attribute.Sentiment sentiment = Attribute.Sentiment.POSITIVE; + // Leaf start - Optimize AttributeMap + public final int uid; + private static int SIZE = 0; diff --git a/leaf-server/minecraft-patches/features/0167-Nitori-Async-playerdata-saving.patch b/leaf-server/minecraft-patches/features/0166-Nitori-Async-playerdata-saving.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0167-Nitori-Async-playerdata-saving.patch rename to leaf-server/minecraft-patches/features/0166-Nitori-Async-playerdata-saving.patch diff --git a/leaf-server/minecraft-patches/features/0168-Optimize-nearby-alive-players-for-spawning.patch b/leaf-server/minecraft-patches/features/0167-Optimize-nearby-alive-players-for-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0168-Optimize-nearby-alive-players-for-spawning.patch rename to leaf-server/minecraft-patches/features/0167-Optimize-nearby-alive-players-for-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0169-Cache-blockstate-cache-array.patch b/leaf-server/minecraft-patches/features/0168-Cache-blockstate-cache-array.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0169-Cache-blockstate-cache-array.patch rename to leaf-server/minecraft-patches/features/0168-Cache-blockstate-cache-array.patch diff --git a/leaf-server/minecraft-patches/features/0170-Smart-sort-entities-in-NearestLivingEntitySensor.patch b/leaf-server/minecraft-patches/features/0169-Smart-sort-entities-in-NearestLivingEntitySensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0170-Smart-sort-entities-in-NearestLivingEntitySensor.patch rename to leaf-server/minecraft-patches/features/0169-Smart-sort-entities-in-NearestLivingEntitySensor.patch diff --git a/leaf-server/minecraft-patches/features/0171-Further-reduce-memory-footprint-of-CompoundTag.patch b/leaf-server/minecraft-patches/features/0170-Further-reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0171-Further-reduce-memory-footprint-of-CompoundTag.patch rename to leaf-server/minecraft-patches/features/0170-Further-reduce-memory-footprint-of-CompoundTag.patch diff --git a/leaf-server/minecraft-patches/features/0172-Optimize-Entity-distanceToSqr.patch b/leaf-server/minecraft-patches/features/0171-Optimize-Entity-distanceToSqr.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0172-Optimize-Entity-distanceToSqr.patch rename to leaf-server/minecraft-patches/features/0171-Optimize-Entity-distanceToSqr.patch diff --git a/leaf-server/minecraft-patches/features/0173-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch b/leaf-server/minecraft-patches/features/0172-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0173-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch rename to leaf-server/minecraft-patches/features/0172-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch diff --git a/leaf-server/minecraft-patches/features/0174-Cache-tile-entity-position.patch b/leaf-server/minecraft-patches/features/0173-Cache-tile-entity-position.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0174-Cache-tile-entity-position.patch rename to leaf-server/minecraft-patches/features/0173-Cache-tile-entity-position.patch diff --git a/leaf-server/minecraft-patches/features/0175-TT20-Lag-compensation.patch b/leaf-server/minecraft-patches/features/0174-TT20-Lag-compensation.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0175-TT20-Lag-compensation.patch rename to leaf-server/minecraft-patches/features/0174-TT20-Lag-compensation.patch index 8a460765..d741ecb9 100644 --- a/leaf-server/minecraft-patches/features/0175-TT20-Lag-compensation.patch +++ b/leaf-server/minecraft-patches/features/0174-TT20-Lag-compensation.patch @@ -7,7 +7,7 @@ Original license: AGPL-3.0 Original project: https://github.com/snackbag/TT20 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 90409e9ef5cac2abe6748b723207c33224821194..a780cba7e2e95412226d9e80b892ab0126f50666 100644 +index 61ace7508597981fa3ab7bb43128814920cc1b80..88829d89434e7688c274937604b0568096e2bde1 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1541,6 +1541,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop getOptionalPlayers(CommandContext context, String name) throws CommandSyntaxException { diff --git a/net/minecraft/commands/arguments/selector/EntitySelector.java b/net/minecraft/commands/arguments/selector/EntitySelector.java -index bbaf1a29f86a9bfc13795249d545b6f7f1bb53eb..60904d6b3046d28b8bba5c050225bf476f2f601a 100644 +index 6fb844999589ac17c8586c9b3f202345aa80d7fb..b61ab7f55ef6adbf748988332276716829e393d0 100644 --- a/net/minecraft/commands/arguments/selector/EntitySelector.java +++ b/net/minecraft/commands/arguments/selector/EntitySelector.java @@ -165,6 +165,51 @@ public class EntitySelector { diff --git a/leaf-server/minecraft-patches/features/0266-Optimise-getEntities.patch b/leaf-server/minecraft-patches/features/0265-Optimise-getEntities.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0266-Optimise-getEntities.patch rename to leaf-server/minecraft-patches/features/0265-Optimise-getEntities.patch index 1674ad53..3201e3d4 100644 --- a/leaf-server/minecraft-patches/features/0266-Optimise-getEntities.patch +++ b/leaf-server/minecraft-patches/features/0265-Optimise-getEntities.patch @@ -86,7 +86,7 @@ index 7f508c50e451a0689218cd36e6ac993f87092c04..a6c1f450f32fa688b102140963fd5bfb } diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index c63c2d1b6bd005eda12c8c1f7cec2a29856fed14..2107514e75b646d9af7471848252924206cbbb9b 100644 +index 09e0b1bb9f8e4605097af6466681f9aec4e0204f..4ab8e8b4301c4ab474c7c4362b40303627363e82 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -2276,7 +2276,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0267-fix-MC-298464.patch b/leaf-server/minecraft-patches/features/0266-fix-MC-298464.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0267-fix-MC-298464.patch rename to leaf-server/minecraft-patches/features/0266-fix-MC-298464.patch diff --git a/leaf-server/minecraft-patches/features/0268-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch b/leaf-server/minecraft-patches/features/0267-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0268-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch rename to leaf-server/minecraft-patches/features/0267-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch diff --git a/leaf-server/minecraft-patches/features/0269-optimize-checkInsideBlocks-calls.patch b/leaf-server/minecraft-patches/features/0268-optimize-checkInsideBlocks-calls.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0269-optimize-checkInsideBlocks-calls.patch rename to leaf-server/minecraft-patches/features/0268-optimize-checkInsideBlocks-calls.patch diff --git a/leaf-server/minecraft-patches/features/0270-Op-lock.patch b/leaf-server/minecraft-patches/features/0269-Op-lock.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0270-Op-lock.patch rename to leaf-server/minecraft-patches/features/0269-Op-lock.patch diff --git a/leaf-server/minecraft-patches/features/0271-Custom-NonNullList.patch b/leaf-server/minecraft-patches/features/0270-Custom-NonNullList.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0271-Custom-NonNullList.patch rename to leaf-server/minecraft-patches/features/0270-Custom-NonNullList.patch diff --git a/leaf-server/minecraft-patches/features/0272-Optimise-TextColor.patch b/leaf-server/minecraft-patches/features/0271-Optimise-TextColor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0272-Optimise-TextColor.patch rename to leaf-server/minecraft-patches/features/0271-Optimise-TextColor.patch diff --git a/leaf-server/minecraft-patches/features/0273-Do-not-create-fire-if-explosion-was-cancelled.patch b/leaf-server/minecraft-patches/features/0272-Do-not-create-fire-if-explosion-was-cancelled.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0273-Do-not-create-fire-if-explosion-was-cancelled.patch rename to leaf-server/minecraft-patches/features/0272-Do-not-create-fire-if-explosion-was-cancelled.patch diff --git a/leaf-server/minecraft-patches/features/0274-Skip-BlockPhysicsEvent-if-no-listeners.patch b/leaf-server/minecraft-patches/features/0273-Skip-BlockPhysicsEvent-if-no-listeners.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0274-Skip-BlockPhysicsEvent-if-no-listeners.patch rename to leaf-server/minecraft-patches/features/0273-Skip-BlockPhysicsEvent-if-no-listeners.patch diff --git a/leaf-server/minecraft-patches/features/0275-Lithium-equipment-tracking.patch b/leaf-server/minecraft-patches/features/0274-Lithium-equipment-tracking.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0275-Lithium-equipment-tracking.patch rename to leaf-server/minecraft-patches/features/0274-Lithium-equipment-tracking.patch index 73e31833..4de2d0b6 100644 --- a/leaf-server/minecraft-patches/features/0275-Lithium-equipment-tracking.patch +++ b/leaf-server/minecraft-patches/features/0274-Lithium-equipment-tracking.patch @@ -241,7 +241,7 @@ index 90814ad07a2686c5a274860395f5aca29cc3bf13..94c7ae9535a235abb8fddf0ca6578dfa + } } diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 2107514e75b646d9af7471848252924206cbbb9b..cf5e968b3ebf516841580e1ec4b474f5303616fa 100644 +index 4ab8e8b4301c4ab474c7c4362b40303627363e82..0e7ff8093241c9ac5c4a62edb2c250eeb0e80d3e 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -431,7 +431,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0276-fix-purpur-attribute-base-patch.patch b/leaf-server/minecraft-patches/features/0275-fix-purpur-attribute-base-patch.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0276-fix-purpur-attribute-base-patch.patch rename to leaf-server/minecraft-patches/features/0275-fix-purpur-attribute-base-patch.patch index 4c26be32..254bc7f3 100644 --- a/leaf-server/minecraft-patches/features/0276-fix-purpur-attribute-base-patch.patch +++ b/leaf-server/minecraft-patches/features/0275-fix-purpur-attribute-base-patch.patch @@ -18,7 +18,7 @@ index 86a694b94045b47f6e98c480645f75738b8a052c..bb9554463a6983ab98323f4dd665c7c1 // Purpur end - Configurable entity base attributes diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index cf5e968b3ebf516841580e1ec4b474f5303616fa..5b8fbc73b4d165b56c7133ed4a0156570ecb58a1 100644 +index 0e7ff8093241c9ac5c4a62edb2c250eeb0e80d3e..e2f532433df740926ddfb44b6f65299d42241bff 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -2853,6 +2853,16 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0277-Bump-netty-to-4.2.x.patch b/leaf-server/minecraft-patches/features/0276-Bump-netty-to-4.2.x.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0277-Bump-netty-to-4.2.x.patch rename to leaf-server/minecraft-patches/features/0276-Bump-netty-to-4.2.x.patch diff --git a/leaf-server/minecraft-patches/features/0278-Paper-PR-Optimise-temptation-lookups.patch b/leaf-server/minecraft-patches/features/0277-Paper-PR-Optimise-temptation-lookups.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0278-Paper-PR-Optimise-temptation-lookups.patch rename to leaf-server/minecraft-patches/features/0277-Paper-PR-Optimise-temptation-lookups.patch index b20eb51c..d5116816 100644 --- a/leaf-server/minecraft-patches/features/0278-Paper-PR-Optimise-temptation-lookups.patch +++ b/leaf-server/minecraft-patches/features/0277-Paper-PR-Optimise-temptation-lookups.patch @@ -117,7 +117,7 @@ index 0000000000000000000000000000000000000000..5f5cdfc538ba9aa6666c019df6706015 + } +} diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 2712a9bf21731a1cf575dcb4ece19e6f02271c12..8496069c8605bd0233efc9b76492b22be6fefcd9 100644 +index 0ad594fe2548cf1c00f8d75fe076d62c3c99f393..5798786e4a9420b2a3cdc95d564947e36cd2abef 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -936,6 +936,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/leaf-server/minecraft-patches/features/0279-fix-temptation-lookups.patch b/leaf-server/minecraft-patches/features/0278-fix-temptation-lookups.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0279-fix-temptation-lookups.patch rename to leaf-server/minecraft-patches/features/0278-fix-temptation-lookups.patch index 4b568fd6..84861755 100644 --- a/leaf-server/minecraft-patches/features/0279-fix-temptation-lookups.patch +++ b/leaf-server/minecraft-patches/features/0278-fix-temptation-lookups.patch @@ -70,7 +70,7 @@ index 5f5cdfc538ba9aa6666c019df6706015234d7bae..2dfec8f6d0fe833e5f06cf2165ae14bf } } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 8496069c8605bd0233efc9b76492b22be6fefcd9..ba9efafd8e58e1dee7d871892906f85b4cbdf89a 100644 +index 5798786e4a9420b2a3cdc95d564947e36cd2abef..b94f2122da885fe94bd60c7914421968e6a2f3fa 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -936,7 +936,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/leaf-server/minecraft-patches/features/0280-Lithium-combined-heightmap-update.patch b/leaf-server/minecraft-patches/features/0279-Lithium-combined-heightmap-update.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0280-Lithium-combined-heightmap-update.patch rename to leaf-server/minecraft-patches/features/0279-Lithium-combined-heightmap-update.patch diff --git a/leaf-server/minecraft-patches/features/0281-Skip-PreCreatureSpawnEvent-if-no-listeners.patch b/leaf-server/minecraft-patches/features/0280-Skip-PreCreatureSpawnEvent-if-no-listeners.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0281-Skip-PreCreatureSpawnEvent-if-no-listeners.patch rename to leaf-server/minecraft-patches/features/0280-Skip-PreCreatureSpawnEvent-if-no-listeners.patch diff --git a/leaf-server/minecraft-patches/features/0282-optimize-goal-selector.patch b/leaf-server/minecraft-patches/features/0281-optimize-goal-selector.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0282-optimize-goal-selector.patch rename to leaf-server/minecraft-patches/features/0281-optimize-goal-selector.patch diff --git a/leaf-server/minecraft-patches/features/0283-thread-unsafe-chunk-map.patch b/leaf-server/minecraft-patches/features/0282-thread-unsafe-chunk-map.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0283-thread-unsafe-chunk-map.patch rename to leaf-server/minecraft-patches/features/0282-thread-unsafe-chunk-map.patch diff --git a/leaf-server/minecraft-patches/features/0284-optimize-SimpleBitStorage-object-layout.patch b/leaf-server/minecraft-patches/features/0283-optimize-SimpleBitStorage-object-layout.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0284-optimize-SimpleBitStorage-object-layout.patch rename to leaf-server/minecraft-patches/features/0283-optimize-SimpleBitStorage-object-layout.patch diff --git a/leaf-server/minecraft-patches/features/0285-optimize-get-chunk.patch b/leaf-server/minecraft-patches/features/0284-optimize-get-chunk.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0285-optimize-get-chunk.patch rename to leaf-server/minecraft-patches/features/0284-optimize-get-chunk.patch diff --git a/leaf-server/minecraft-patches/features/0286-remove-shouldTickBlocksAt-check.patch b/leaf-server/minecraft-patches/features/0285-remove-shouldTickBlocksAt-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0286-remove-shouldTickBlocksAt-check.patch rename to leaf-server/minecraft-patches/features/0285-remove-shouldTickBlocksAt-check.patch diff --git a/leaf-server/minecraft-patches/features/0287-optimize-PalettedContainer-get.patch b/leaf-server/minecraft-patches/features/0286-optimize-PalettedContainer-get.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0287-optimize-PalettedContainer-get.patch rename to leaf-server/minecraft-patches/features/0286-optimize-PalettedContainer-get.patch diff --git a/leaf-server/minecraft-patches/features/0288-optimize-LevelChunk-getBlockStateFinal.patch b/leaf-server/minecraft-patches/features/0287-optimize-LevelChunk-getBlockStateFinal.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0288-optimize-LevelChunk-getBlockStateFinal.patch rename to leaf-server/minecraft-patches/features/0287-optimize-LevelChunk-getBlockStateFinal.patch diff --git a/leaf-server/minecraft-patches/features/0289-optimize-FluidState-is-TagKey.patch b/leaf-server/minecraft-patches/features/0288-optimize-FluidState-is-TagKey.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0289-optimize-FluidState-is-TagKey.patch rename to leaf-server/minecraft-patches/features/0288-optimize-FluidState-is-TagKey.patch diff --git a/leaf-server/minecraft-patches/features/0290-counting-chunk-section-fluid.patch b/leaf-server/minecraft-patches/features/0289-counting-chunk-section-fluid.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0290-counting-chunk-section-fluid.patch rename to leaf-server/minecraft-patches/features/0289-counting-chunk-section-fluid.patch diff --git a/leaf-server/minecraft-patches/features/0291-optimize-SpreadingSnowyDirtBlock-randomTick.patch b/leaf-server/minecraft-patches/features/0290-optimize-SpreadingSnowyDirtBlock-randomTick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0291-optimize-SpreadingSnowyDirtBlock-randomTick.patch rename to leaf-server/minecraft-patches/features/0290-optimize-SpreadingSnowyDirtBlock-randomTick.patch diff --git a/leaf-server/minecraft-patches/features/0292-optimize-onClimbable.patch b/leaf-server/minecraft-patches/features/0291-optimize-onClimbable.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0292-optimize-onClimbable.patch rename to leaf-server/minecraft-patches/features/0291-optimize-onClimbable.patch index cb1b024b..acf123e9 100644 --- a/leaf-server/minecraft-patches/features/0292-optimize-onClimbable.patch +++ b/leaf-server/minecraft-patches/features/0291-optimize-onClimbable.patch @@ -19,7 +19,7 @@ index d61761dc1683e439af4ebfc393bc8c70de23340f..85789dfd30fe4f3b1108634e84b10f16 return this.inBlockState; diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 5b8fbc73b4d165b56c7133ed4a0156570ecb58a1..f0a0a19e2adff03e73e75c3db831dbf74ebf3861 100644 +index e2f532433df740926ddfb44b6f65299d42241bff..b37f04f395cae15dd249c36235f0c29953febf26 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -2217,10 +2217,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0293-optimize-applyMovementEmissionAndPlaySound.patch b/leaf-server/minecraft-patches/features/0292-optimize-applyMovementEmissionAndPlaySound.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0293-optimize-applyMovementEmissionAndPlaySound.patch rename to leaf-server/minecraft-patches/features/0292-optimize-applyMovementEmissionAndPlaySound.patch diff --git a/leaf-server/minecraft-patches/features/0294-optimize-isStateClimbable.patch b/leaf-server/minecraft-patches/features/0293-optimize-isStateClimbable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0294-optimize-isStateClimbable.patch rename to leaf-server/minecraft-patches/features/0293-optimize-isStateClimbable.patch diff --git a/leaf-server/minecraft-patches/features/0295-optimize-getOnPos.patch b/leaf-server/minecraft-patches/features/0294-optimize-getOnPos.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0295-optimize-getOnPos.patch rename to leaf-server/minecraft-patches/features/0294-optimize-getOnPos.patch index 54b0d506..7635b81b 100644 --- a/leaf-server/minecraft-patches/features/0295-optimize-getOnPos.patch +++ b/leaf-server/minecraft-patches/features/0294-optimize-getOnPos.patch @@ -262,7 +262,7 @@ index 3ee788b172240ccf38cb31385dff13364ccc4142..d88fc291f3c6ea7dd8293d39a4356079 if (this.level() instanceof ServerLevel) { for (ExperienceOrb experienceOrb : this.level() diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index f0a0a19e2adff03e73e75c3db831dbf74ebf3861..b8665f74bc5592b0022636e62482e21c84692d39 100644 +index b37f04f395cae15dd249c36235f0c29953febf26..453c3eb95bebd426d0457f27bda261033dd7b14d 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -3087,7 +3087,11 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0296-cache-eye-block-position.patch b/leaf-server/minecraft-patches/features/0295-cache-eye-block-position.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0296-cache-eye-block-position.patch rename to leaf-server/minecraft-patches/features/0295-cache-eye-block-position.patch index fe47a9fc..fbf36063 100644 --- a/leaf-server/minecraft-patches/features/0296-cache-eye-block-position.patch +++ b/leaf-server/minecraft-patches/features/0295-cache-eye-block-position.patch @@ -115,7 +115,7 @@ index bb16f3ebffcafcb11d3112e03f5767ac71b359f6..29fa9cfa1aa2d507da852f5fe33ea6e4 boolean flag = dimensions.width() <= 4.0F && dimensions.height() <= 4.0F; if (!this.level.isClientSide diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index b8665f74bc5592b0022636e62482e21c84692d39..dc66b2c59984ce62b1d3c4a97c769771229fb4f8 100644 +index 453c3eb95bebd426d0457f27bda261033dd7b14d..8baa17d2eadfa83b1fcb36fcd1408e917b883989 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -464,7 +464,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0297-optimize-updateFluidHeightAndDoFluidPushing.patch b/leaf-server/minecraft-patches/features/0296-optimize-updateFluidHeightAndDoFluidPushing.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0297-optimize-updateFluidHeightAndDoFluidPushing.patch rename to leaf-server/minecraft-patches/features/0296-optimize-updateFluidHeightAndDoFluidPushing.patch diff --git a/leaf-server/minecraft-patches/features/0298-optimize-checkInsideBlocks.patch b/leaf-server/minecraft-patches/features/0297-optimize-checkInsideBlocks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0298-optimize-checkInsideBlocks.patch rename to leaf-server/minecraft-patches/features/0297-optimize-checkInsideBlocks.patch diff --git a/leaf-server/minecraft-patches/features/0299-replace-entity-fluid-height-map.patch b/leaf-server/minecraft-patches/features/0298-replace-entity-fluid-height-map.patch similarity index 91% rename from leaf-server/minecraft-patches/features/0299-replace-entity-fluid-height-map.patch rename to leaf-server/minecraft-patches/features/0298-replace-entity-fluid-height-map.patch index 18fd8245..567cb83d 100644 --- a/leaf-server/minecraft-patches/features/0299-replace-entity-fluid-height-map.patch +++ b/leaf-server/minecraft-patches/features/0298-replace-entity-fluid-height-map.patch @@ -5,7 +5,7 @@ Subject: [PATCH] replace entity fluid height map diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 0804d3dc5262350a194c5e6d86c313364b6fba76..fc1175ae9bf5b59be2575a4e560bb558cbf007f4 100644 +index afc9788b69a9398c295a6fe3801b82fb6d6c3384..dcae12c34690346cb32780f7143fe05549c84c11 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -286,7 +286,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0300-optimize-collision-shape.patch b/leaf-server/minecraft-patches/features/0299-optimize-collision-shape.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0300-optimize-collision-shape.patch rename to leaf-server/minecraft-patches/features/0299-optimize-collision-shape.patch diff --git a/leaf-server/minecraft-patches/features/0301-cache-collision-list.patch b/leaf-server/minecraft-patches/features/0300-cache-collision-list.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0301-cache-collision-list.patch rename to leaf-server/minecraft-patches/features/0300-cache-collision-list.patch diff --git a/leaf-server/paper-patches/features/0048-Paper-PR-Throttle-failed-spawn-attempts.patch b/leaf-server/paper-patches/features/0048-Paper-PR-Throttle-failed-spawn-attempts.patch index 939bb4e4..52e71155 100644 --- a/leaf-server/paper-patches/features/0048-Paper-PR-Throttle-failed-spawn-attempts.patch +++ b/leaf-server/paper-patches/features/0048-Paper-PR-Throttle-failed-spawn-attempts.patch @@ -31,10 +31,10 @@ vain. Throttling spawn attempts in suspected spawnproof chunks improves performance without noticeably advantaging or disadvantaging the mob farm. diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index a457584fcdc062d16414973228f0f0ef387dfb6e..70577f480d2acc3724ab8ab296edc952254c5dac 100644 +index bd1f0ba488ff9f12de4b85c97617638592bab09c..5fc9ec3e564135013622f839e59ef5a0ddff6f71 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -183,6 +183,17 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -184,6 +184,17 @@ public class WorldConfiguration extends ConfigurationPart { @MergeMap public Reference2IntMap ticksPerSpawn = Util.make(new Reference2IntOpenHashMap<>(NaturalSpawner.SPAWNING_CATEGORIES.length), map -> Arrays.stream(NaturalSpawner.SPAWNING_CATEGORIES).forEach(mobCategory -> map.put(mobCategory, -1))); diff --git a/leaf-server/paper-patches/features/0056-optimize-despawn.patch b/leaf-server/paper-patches/features/0056-optimize-despawn.patch index e06b20cd..a9c604cd 100644 --- a/leaf-server/paper-patches/features/0056-optimize-despawn.patch +++ b/leaf-server/paper-patches/features/0056-optimize-despawn.patch @@ -5,10 +5,10 @@ Subject: [PATCH] optimize despawn diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index 70577f480d2acc3724ab8ab296edc952254c5dac..136a78ab446ed75d2b5b6741c3003e5c9d532d85 100644 +index 5fc9ec3e564135013622f839e59ef5a0ddff6f71..012c500c4a5a06be92fa17c141b15ca6547c8483 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -178,7 +178,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -179,7 +179,7 @@ public class WorldConfiguration extends ConfigurationPart { @MergeMap public Reference2IntMap spawnLimits = Util.make(new Reference2IntOpenHashMap<>(NaturalSpawner.SPAWNING_CATEGORIES.length), map -> Arrays.stream(NaturalSpawner.SPAWNING_CATEGORIES).forEach(mobCategory -> map.put(mobCategory, -1))); @MergeMap