diff --git a/patches/server/0018-Add-experiment-config-for-command-block-command-exec.patch b/patches/server/0018-Add-experiment-config-for-command-block-command-exec.patch new file mode 100644 index 0000000..4714bc5 --- /dev/null +++ b/patches/server/0018-Add-experiment-config-for-command-block-command-exec.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Sat, 31 Aug 2024 10:56:58 +0800 +Subject: [PATCH] Add experiment config for command block command execution + + +diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockConfig.java b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockConfig.java +new file mode 100644 +index 0000000000000000000000000000000000000000..3eafc59cc015569d3da8b1d8c4bfd046af17e0be +--- /dev/null ++++ b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockConfig.java +@@ -0,0 +1,20 @@ ++package me.earthme.luminol.config.modules.experiment; ++ ++import me.earthme.luminol.config.ConfigInfo; ++import me.earthme.luminol.config.EnumConfigCategory; ++import me.earthme.luminol.config.IConfigModule; ++ ++public class CommandBlockConfig implements IConfigModule { ++ @ConfigInfo(baseName = "enable") ++ public static boolean enabled = false; ++ ++ @Override ++ public EnumConfigCategory getCategory() { ++ return EnumConfigCategory.EXPERIMENT; ++ } ++ ++ @Override ++ public String getBaseName() { ++ return "force_enable_command_block_execution"; ++ } ++} +diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java +index b8a571fcc44f67ac8f6089e039a8620bf6c40603..c973535eba031f102c6cae8f9b75547ba3a95376 100644 +--- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java ++++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java +@@ -117,7 +117,7 @@ public abstract class BaseCommandBlock implements CommandSource { + } + + public boolean performCommand(Level world) { +- if (true) return false; // Folia - region threading ++ if (!me.earthme.luminol.config.modules.experiment.CommandBlockConfig.enabled) return false; // Folia - region threading // Luminol + if (!world.isClientSide && world.getGameTime() != this.lastExecution) { + if ("Searge".equalsIgnoreCase(this.command)) { + this.lastOutput = Component.literal("#itzlipofutzli"); diff --git a/patches/server/0018-Try-fixing-folia-spector-teleportation.patch b/patches/server/0019-Try-fixing-folia-spector-teleportation.patch similarity index 96% rename from patches/server/0018-Try-fixing-folia-spector-teleportation.patch rename to patches/server/0019-Try-fixing-folia-spector-teleportation.patch index fe3a8ab..5c721d4 100644 --- a/patches/server/0018-Try-fixing-folia-spector-teleportation.patch +++ b/patches/server/0019-Try-fixing-folia-spector-teleportation.patch @@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..01f8c6ff3662569be5a4ff998bcd4fbb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index dc95bd8ed9db016f8d5419f832b11e0b77097c0b..a278097ed9a8a6bada11bef1af2eda617f040ea8 100644 +index a737fb8dac485303d2ee7399d4dae8dbbff2f7fe..7da908cfc85e2406e995d860a240aaf3f999b6e6 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -929,6 +929,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple diff --git a/patches/server/0019-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 97% rename from patches/server/0019-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch index 30f578c..608d021 100644 --- a/patches/server/0019-Teleport-async-if-entity-was-moving-to-another-regio.patch +++ b/patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch @@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..0e51d465db3554ac80d00c6b85cc1f01 + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a949998d40e5113db87f887f8c80067218dd33b3..6f6ae49cf8918e00e4469f0e5fa4a03aa25d19d4 100644 +index 4b85556eea3fb64f5bb7f44fa63681c65c2f3ff5..622de6624132abd9aecf4d4ab5c9630446549e5c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1123,6 +1123,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0020-Try-fixing-folia-off-region-POI-accessing-issue.patch b/patches/server/0021-Try-fixing-folia-off-region-POI-accessing-issue.patch similarity index 100% rename from patches/server/0020-Try-fixing-folia-off-region-POI-accessing-issue.patch rename to patches/server/0021-Try-fixing-folia-off-region-POI-accessing-issue.patch diff --git a/patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0022-Prevent-teleportAsync-calling-during-moving-event-be.patch similarity index 97% rename from patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch rename to patches/server/0022-Prevent-teleportAsync-calling-during-moving-event-be.patch index 60f310d..6a7eecc 100644 --- a/patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch +++ b/patches/server/0022-Prevent-teleportAsync-calling-during-moving-event-be.patch @@ -50,7 +50,7 @@ index 7da908cfc85e2406e995d860a240aaf3f999b6e6..23541e9c5734334a1cd6e7730288d6dd super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); this.chatVisibility = ChatVisiblity.FULL; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8a6e2ec591815eb41c4fd04c51acb3681972e928..7a3085e0328cf37f22cba331f97b295db44224b9 100644 +index 804166bf2da81927ab449811be9fcf67e74eed00..fda2075b848612eae057ffc644a1ecf4ea841956 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -695,7 +695,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -74,7 +74,7 @@ index 8a6e2ec591815eb41c4fd04c51acb3681972e928..7a3085e0328cf37f22cba331f97b295d // If the event is cancelled we move the player back to their old location. if (event.isCancelled()) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6f6ae49cf8918e00e4469f0e5fa4a03aa25d19d4..a90820a672379639e89c5bb71abcd9aa69227473 100644 +index 622de6624132abd9aecf4d4ab5c9630446549e5c..91b57934e8acf8fc6f23ba01db04bd7a315b06dd 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4073,6 +4073,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0022-Try-optimizing-the-task-dispatching.patch b/patches/server/0023-Try-optimizing-the-task-dispatching.patch similarity index 100% rename from patches/server/0022-Try-optimizing-the-task-dispatching.patch rename to patches/server/0023-Try-optimizing-the-task-dispatching.patch diff --git a/patches/server/0023-Force-disable-builtin-spark-plugin.patch b/patches/server/0024-Force-disable-builtin-spark-plugin.patch similarity index 99% rename from patches/server/0023-Force-disable-builtin-spark-plugin.patch rename to patches/server/0024-Force-disable-builtin-spark-plugin.patch index 2248ce4..58644af 100644 --- a/patches/server/0023-Force-disable-builtin-spark-plugin.patch +++ b/patches/server/0024-Force-disable-builtin-spark-plugin.patch @@ -91,7 +91,7 @@ index 79b79a5d41dc3568ae6a3d7701e6ac6b91045e36..cd28f741343c443ff4728fc0aa5526b6 com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 60b10a6e1fcc06430c5cacd4c49d92e1de6e4778..050ec65f1b488677781b74b824b5b5dde184c7e0 100644 +index 39e4493ef5c7d4bfd903da18b76e14235a535ab5..be126a3139b1519e7a0ad3d521d72bf0817ccb1c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -309,7 +309,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0024-Check-allow-before-getting-block-state-while-tripwir.patch b/patches/server/0025-Check-allow-before-getting-block-state-while-tripwir.patch similarity index 100% rename from patches/server/0024-Check-allow-before-getting-block-state-while-tripwir.patch rename to patches/server/0025-Check-allow-before-getting-block-state-while-tripwir.patch diff --git a/patches/server/0025-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0026-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0025-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0026-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0026-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0027-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 97% rename from patches/server/0026-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0027-Kaiiju-Vanilla-end-portal-teleportation.patch index f959712..a3de533 100644 --- a/patches/server/0026-Kaiiju-Vanilla-end-portal-teleportation.patch +++ b/patches/server/0027-Kaiiju-Vanilla-end-portal-teleportation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Kaiiju Vanilla end portal teleportation diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a90820a672379639e89c5bb71abcd9aa69227473..2072a4ca67f131212b71570e1eeb0d4755b64993 100644 +index 91b57934e8acf8fc6f23ba01db04bd7a315b06dd..a2f550d2632459e271a3e9ff796dde4891e12e7a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -109,6 +109,7 @@ import net.minecraft.world.level.block.Rotation; diff --git a/patches/server/0027-Petal-Reduce-sensor-work.patch b/patches/server/0028-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0027-Petal-Reduce-sensor-work.patch rename to patches/server/0028-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0028-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0029-Pufferfish-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0028-Pufferfish-Improve-fluid-direction-caching.patch rename to patches/server/0029-Pufferfish-Improve-fluid-direction-caching.patch diff --git a/patches/server/0029-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0030-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 96% rename from patches/server/0029-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0030-Pufferfish-Cache-climbing-check-for-activation.patch index 936e87e..dc74165 100644 --- a/patches/server/0029-Pufferfish-Cache-climbing-check-for-activation.patch +++ b/patches/server/0030-Pufferfish-Cache-climbing-check-for-activation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Pufferfish Cache climbing check for activation diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8ccc18881d047e2b06ab3494a25f27e209931413..30bd7101cca4a93df592f0e3c0dd4aac0f347d07 100644 +index bd544eee8d7439a466f0f82e7d7a51a63b7294c0..a279d742c5743027219482d9aebe345751e68a72 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; diff --git a/patches/server/0030-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0031-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0030-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0031-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0031-Pufferfish-Early-return-optimization-for-target-find.patch b/patches/server/0032-Pufferfish-Early-return-optimization-for-target-find.patch similarity index 100% rename from patches/server/0031-Pufferfish-Early-return-optimization-for-target-find.patch rename to patches/server/0032-Pufferfish-Early-return-optimization-for-target-find.patch diff --git a/patches/server/0032-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0033-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0032-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0033-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0033-Pufferfish-Skip-cloning-loot-parameters.patch b/patches/server/0034-Pufferfish-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0033-Pufferfish-Skip-cloning-loot-parameters.patch rename to patches/server/0034-Pufferfish-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0034-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0035-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 97% rename from patches/server/0034-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0035-Pufferfish-Reduce-projectile-chunk-loading.patch index e6ad98c..11787cb 100644 --- a/patches/server/0034-Pufferfish-Reduce-projectile-chunk-loading.patch +++ b/patches/server/0035-Pufferfish-Reduce-projectile-chunk-loading.patch @@ -33,7 +33,7 @@ index 0000000000000000000000000000000000000000..12683ec5a5102e45b6171fea0b833ba5 + } +} diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index c7a59234fb1fdc09745b62039011d0d2f7cd3fb6..c1b0cf6e09914404d1fcf302af03666342e1dc30 100644 +index fa3ec592bdb6325eebd5a7d59810add67c4a9968..b6d72a24a61b30b7c4ad967c196c3fbaa9d68ee9 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -52,6 +52,40 @@ public abstract class Projectile extends Entity implements TraceableEntity { diff --git a/patches/server/0035-Pufferfish-Entity-TTL.patch b/patches/server/0036-Pufferfish-Entity-TTL.patch similarity index 97% rename from patches/server/0035-Pufferfish-Entity-TTL.patch rename to patches/server/0036-Pufferfish-Entity-TTL.patch index 7660d49..dd57087 100644 --- a/patches/server/0035-Pufferfish-Entity-TTL.patch +++ b/patches/server/0036-Pufferfish-Entity-TTL.patch @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..15697d69659b6e1e776acf5094684b5f + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2072a4ca67f131212b71570e1eeb0d4755b64993..88ee5f9f8fc453d0dc18547a8c2823fa56ce8579 100644 +index a2f550d2632459e271a3e9ff796dde4891e12e7a..d68328d4c429d4fc95c19e9477d0795beba2f53f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -858,6 +858,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0036-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0037-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 100% rename from patches/server/0036-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0037-Pufferfish-Dynamic-Activation-of-Brain.patch diff --git a/patches/server/0037-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0038-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0037-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0038-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0038-Pufferfish-Optimize-suffocation.patch b/patches/server/0039-Pufferfish-Optimize-suffocation.patch similarity index 97% rename from patches/server/0038-Pufferfish-Optimize-suffocation.patch rename to patches/server/0039-Pufferfish-Optimize-suffocation.patch index fd3bace..1c05967 100644 --- a/patches/server/0038-Pufferfish-Optimize-suffocation.patch +++ b/patches/server/0039-Pufferfish-Optimize-suffocation.patch @@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..3e48cd297b4869e5c89b6abc43c726d3 + } +} diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 30bd7101cca4a93df592f0e3c0dd4aac0f347d07..f39842df9abb752f43a5b98030a276baf71f7067 100644 +index a279d742c5743027219482d9aebe345751e68a72..c2398397567d03274ab3214723c35c5a950e9a32 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -463,7 +463,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0039-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0040-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 96% rename from patches/server/0039-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0040-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch index 79d6122..31f4c4b 100644 --- a/patches/server/0039-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch +++ b/patches/server/0040-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch @@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..acc032f727e605e79b688efb4873ff47 + } +} diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 96a95939df41721433cefbfc07a5d75ea6b961e9..2384a9e68f99b61382d9d8a46523d226786ee584 100644 +index 121e9cbeb07a41febac0086f5fce5a172a4ad15e..84281b92b2c02c70702d43ebcf7afa85914e03fb 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -240,11 +240,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab diff --git a/patches/server/0040-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch b/patches/server/0041-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch similarity index 100% rename from patches/server/0040-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch rename to patches/server/0041-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch diff --git a/patches/server/0041-Pufferfish-SIMD-Utilities.patch b/patches/server/0042-Pufferfish-SIMD-Utilities.patch similarity index 97% rename from patches/server/0041-Pufferfish-SIMD-Utilities.patch rename to patches/server/0042-Pufferfish-SIMD-Utilities.patch index efc18a7..b65efb1 100644 --- a/patches/server/0041-Pufferfish-SIMD-Utilities.patch +++ b/patches/server/0042-Pufferfish-SIMD-Utilities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Pufferfish SIMD Utilities diff --git a/build.gradle.kts b/build.gradle.kts -index c2d3d699edfd60d773af96116c5663c812c691e9..1049681dfa7e48b4b6c29f4b1a09c689ac918500 100644 +index eb708f155a19496dcd19e69540274000611f4eee..83b8495bd52ad9ea38e9001a7ab209bf8ecdbe86 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,6 +76,14 @@ paperweight { diff --git a/patches/server/0042-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0043-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0042-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0043-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0043-Gale-Optimize-sun-burn-tick.patch b/patches/server/0044-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0043-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0044-Gale-Optimize-sun-burn-tick.patch diff --git a/patches/server/0044-Gale-Use-platform-math-functions.patch b/patches/server/0045-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0044-Gale-Use-platform-math-functions.patch rename to patches/server/0045-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0045-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0046-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 95% rename from patches/server/0045-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0046-Gale-Skip-entity-move-if-movement-is-zero.patch index bf45a39..40f2aab 100644 --- a/patches/server/0045-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0046-Gale-Skip-entity-move-if-movement-is-zero.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 071de4ddcff846f469d510b4147c3ed3cb31d7af..aeeef108f7d45c3a420874c7de769e4fb9097af0 100644 +index 70e10a88a70608f4067018dfeb1d60127b4a9c25..1e38ffc28036a221da9adeff8c07c8c02e736cb8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0046-Gale-Optimize-noise-generation.patch b/patches/server/0047-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0046-Gale-Optimize-noise-generation.patch rename to patches/server/0047-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0047-Gale-Faster-chunk-serialization.patch b/patches/server/0048-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0047-Gale-Faster-chunk-serialization.patch rename to patches/server/0048-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0048-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0049-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0048-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0049-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0049-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0050-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0049-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0050-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0050-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0051-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 95% rename from patches/server/0050-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0051-Sparkly-Paper-Optimize-canSee-checks.patch index d031f5e..2e3f11b 100644 --- a/patches/server/0050-Sparkly-Paper-Optimize-canSee-checks.patch +++ b/patches/server/0051-Sparkly-Paper-Optimize-canSee-checks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Sparkly Paper Optimize canSee checks diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 31f2f6e841179a2fba2199afa7d6211eb68d3c07..1bc460051ded5faa7010f999dfee0904bce1a31e 100644 +index 728454fcfbeddcfe1b0a95e89827f33d7f7838bc..adc1e7867dfd7caf1a3a4ad515b6540d277c6b7f 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1221,7 +1221,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -18,7 +18,7 @@ index 31f2f6e841179a2fba2199afa7d6211eb68d3c07..1bc460051ded5faa7010f999dfee0904 } // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 61683135b0462770cfe93e16fd0d0c1bca13e045..572c85579237afa65ffb3409fa3b70c7f86fcb0f 100644 +index f13128a9e5462ae1047987ad29d35c72f74c5412..f1cb17f33363da495c263829efbbd18d4bd192cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -200,7 +200,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0051-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0052-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0051-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0052-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0052-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0053-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0052-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0053-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0053-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0054-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 100% rename from patches/server/0053-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0054-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch diff --git a/patches/server/0054-Purpur-use-alternative-keep-alive.patch b/patches/server/0055-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0054-Purpur-use-alternative-keep-alive.patch rename to patches/server/0055-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0055-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0056-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0055-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0056-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0056-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0057-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0056-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0057-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0057-Fix-MC-2025.patch b/patches/server/0058-Fix-MC-2025.patch similarity index 95% rename from patches/server/0057-Fix-MC-2025.patch rename to patches/server/0058-Fix-MC-2025.patch index 113ae08..6f9814a 100644 --- a/patches/server/0057-Fix-MC-2025.patch +++ b/patches/server/0058-Fix-MC-2025.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix-MC-2025 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3d304852c51eb6aec99c766fb73fc4cb7382ad0b..701c3513e5c11204336502b822b79f2f333ad2e3 100644 +index ea1098d2ff613ff634c710b6be6994215719391f..3a0279991d1f65f65aeb8e228f04202761b3e85b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2623,6 +2623,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0058-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0059-FoliaPR-Add-TPS-From-Region.patch similarity index 96% rename from patches/server/0058-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0059-FoliaPR-Add-TPS-From-Region.patch index e13e70d..8959813 100644 --- a/patches/server/0058-FoliaPR-Add-TPS-From-Region.patch +++ b/patches/server/0059-FoliaPR-Add-TPS-From-Region.patch @@ -5,7 +5,7 @@ Subject: [PATCH] FoliaPR Add TPS From Region diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 050ec65f1b488677781b74b824b5b5dde184c7e0..2d53fe0a34ccfdeac159d2912f062a5aea1e3717 100644 +index be126a3139b1519e7a0ad3d521d72bf0817ccb1c..a1835ef6ec6f1d1e340f3c4817b5897d806c8210 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -3071,6 +3071,42 @@ public final class CraftServer implements Server {