diff --git a/patches/server/0003-Empty-config-file-base.patch b/patches/server/0003-Empty-config-file-base.patch index 57ade0e..c94ce1d 100644 --- a/patches/server/0003-Empty-config-file-base.patch +++ b/patches/server/0003-Empty-config-file-base.patch @@ -125,17 +125,18 @@ index 0000000000000000000000000000000000000000..fffc5eb4be4b78a886f3c340bd60f3a2 +} diff --git a/src/main/java/me/earthme/luminol/config/EnumConfigCategory.java b/src/main/java/me/earthme/luminol/config/EnumConfigCategory.java new file mode 100644 -index 0000000000000000000000000000000000000000..ac2a92fe0ddbebb71ea4dd8c96f461d06ec29a4c +index 0000000000000000000000000000000000000000..7b75405c468d24ed8aea5aa54ae5ac339118bf60 --- /dev/null +++ b/src/main/java/me/earthme/luminol/config/EnumConfigCategory.java -@@ -0,0 +1,18 @@ +@@ -0,0 +1,19 @@ +package me.earthme.luminol.config; + +public enum EnumConfigCategory { + OPTIMIZATIONS("optimizations"), + FIXES("fixes"), + MISC("misc"), -+ GAMEPLAY("gameplay"); ++ GAMEPLAY("gameplay"), ++ EXPERIMENT("experiment"); + + private final String baseKeyName; + @@ -414,7 +415,7 @@ index 0000000000000000000000000000000000000000..2b4e64796bf01b0a5fcb306850cd6083 + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index bd333ffb44798069e180cad67c07d86425253024..bbd3b57b83b71ae9840124909f3864c36254f02c 100644 +index cc40d3e69a3635ca7895876159f2821091c14a9a..e456435e2f0606e840c7f4c0ff522e49da6e40e1 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -222,6 +222,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0016-Add-config-to-disable-entity-tick-catchers.patch b/patches/server/0016-Add-config-to-disable-entity-tick-catchers.patch new file mode 100644 index 0000000..c3b715e --- /dev/null +++ b/patches/server/0016-Add-config-to-disable-entity-tick-catchers.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Mon, 12 Aug 2024 21:30:50 +0800 +Subject: [PATCH] Add config to disable entity tick catchers + + +diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/DisableEntityCatchConfig.java b/src/main/java/me/earthme/luminol/config/modules/experiment/DisableEntityCatchConfig.java +new file mode 100644 +index 0000000000000000000000000000000000000000..0fd71151a85dd87c2294033e2e7512ac365caa62 +--- /dev/null ++++ b/src/main/java/me/earthme/luminol/config/modules/experiment/DisableEntityCatchConfig.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 DisableEntityCatchConfig implements IConfigModule { ++ @ConfigInfo(baseName = "enabled") ++ public static boolean enabled = false; ++ ++ @Override ++ public EnumConfigCategory getCategory() { ++ return EnumConfigCategory.EXPERIMENT; ++ } ++ ++ @Override ++ public String getBaseName() { ++ return "disable_entity_exception_catchers"; ++ } ++} +diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java +index 75ecbdb5bdacb4d4b27d60fe1c1a35c3a9c16207..fc43204a9234ebac35003121e7ae29e566a6386b 100644 +--- a/src/main/java/net/minecraft/world/level/Level.java ++++ b/src/main/java/net/minecraft/world/level/Level.java +@@ -1351,7 +1351,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { + tickConsumer.accept(entity); + MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick + } catch (Throwable throwable) { +- if (throwable instanceof ThreadDeath) throw throwable; // Paper ++ if (throwable instanceof ThreadDeath || me.earthme.luminol.config.modules.experiment.DisableEntityCatchConfig.enabled) throw throwable; // Paper // Luminol + // Paper start - Prevent block entity and entity crashes + final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ()); + MinecraftServer.LOGGER.error(msg, throwable); diff --git a/patches/server/0017-Add-config-to-disable-async-catchers.patch b/patches/server/0017-Add-config-to-disable-async-catchers.patch new file mode 100644 index 0000000..b065670 --- /dev/null +++ b/patches/server/0017-Add-config-to-disable-async-catchers.patch @@ -0,0 +1,106 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Mon, 12 Aug 2024 21:29:59 +0800 +Subject: [PATCH] Add config to disable async catchers + + +diff --git a/src/main/java/io/papermc/paper/util/TickThread.java b/src/main/java/io/papermc/paper/util/TickThread.java +index 906f1c9e619a924c622acc76652a4569305edc8d..aaa72fd0bb866ac18ee06e8f50b1374b24c4a8de 100644 +--- a/src/main/java/io/papermc/paper/util/TickThread.java ++++ b/src/main/java/io/papermc/paper/util/TickThread.java +@@ -46,49 +46,49 @@ public class TickThread extends Thread { + */ + @Deprecated + public static void ensureTickThread(final String reason) { +- if (!isTickThread()) { ++ if (!isTickThread() && !me.earthme.luminol.config.modules.experiment.DisableAsyncCatcherConfig.enabled) { // Luminol + MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); + throw new IllegalStateException(reason); + } + } + + public static void ensureTickThread(final ServerLevel world, final BlockPos pos, final String reason) { +- if (!isTickThreadFor(world, pos)) { ++ if (!isTickThreadFor(world, pos) && !me.earthme.luminol.config.modules.experiment.DisableAsyncCatcherConfig.enabled) { // Luminol + MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); + throw new IllegalStateException(reason); + } + } + + public static void ensureTickThread(final ServerLevel world, final ChunkPos pos, final String reason) { +- if (!isTickThreadFor(world, pos)) { ++ if (!isTickThreadFor(world, pos) && !me.earthme.luminol.config.modules.experiment.DisableAsyncCatcherConfig.enabled) { // Luminol + MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); + throw new IllegalStateException(reason); + } + } + + public static void ensureTickThread(final ServerLevel world, final int chunkX, final int chunkZ, final String reason) { +- if (!isTickThreadFor(world, chunkX, chunkZ)) { ++ if (!isTickThreadFor(world, chunkX, chunkZ) && !me.earthme.luminol.config.modules.experiment.DisableAsyncCatcherConfig.enabled) { // Luminol + MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); + throw new IllegalStateException(reason); + } + } + + public static void ensureTickThread(final Entity entity, final String reason) { +- if (!isTickThreadFor(entity)) { ++ if (!isTickThreadFor(entity) && !me.earthme.luminol.config.modules.experiment.DisableAsyncCatcherConfig.enabled) { // Luminol + MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); + throw new IllegalStateException(reason); + } + } + + public static void ensureTickThread(final ServerLevel world, final AABB aabb, final String reason) { +- if (!isTickThreadFor(world, aabb)) { ++ if (!isTickThreadFor(world, aabb) && !me.earthme.luminol.config.modules.experiment.DisableAsyncCatcherConfig.enabled) { // Luminol + MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); + throw new IllegalStateException(reason); + } + } + + public static void ensureTickThread(final ServerLevel world, final double blockX, final double blockZ, final String reason) { +- if (!isTickThreadFor(world, blockX, blockZ)) { ++ if (!isTickThreadFor(world, blockX, blockZ) && !me.earthme.luminol.config.modules.experiment.DisableAsyncCatcherConfig.enabled) { // Luminol + MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); + throw new IllegalStateException(reason); + } +diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/DisableAsyncCatcherConfig.java b/src/main/java/me/earthme/luminol/config/modules/experiment/DisableAsyncCatcherConfig.java +new file mode 100644 +index 0000000000000000000000000000000000000000..61f653eeca366672ded88c491cf5c59e546e7301 +--- /dev/null ++++ b/src/main/java/me/earthme/luminol/config/modules/experiment/DisableAsyncCatcherConfig.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 DisableAsyncCatcherConfig implements IConfigModule { ++ @ConfigInfo(baseName = "enabled") ++ public static boolean enabled = false; ++ ++ @Override ++ public EnumConfigCategory getCategory() { ++ return EnumConfigCategory.EXPERIMENT; ++ } ++ ++ @Override ++ public String getBaseName() { ++ return "disable_async_catchers"; ++ } ++} +diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java +index 2e074c16dab1ead47914070329da0398c3274048..0a9151125539bb20f94a3d8b307b328d4abbe010 100644 +--- a/src/main/java/org/spigotmc/AsyncCatcher.java ++++ b/src/main/java/org/spigotmc/AsyncCatcher.java +@@ -9,7 +9,7 @@ public class AsyncCatcher + + public static void catchOp(String reason) + { +- if (!(io.papermc.paper.util.TickThread.isTickThread())) // Paper ++ if (!(io.papermc.paper.util.TickThread.isTickThread()) && !me.earthme.luminol.config.modules.experiment.DisableAsyncCatcherConfig.enabled) // Luminol + { + MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); // Paper + throw new IllegalStateException( "Asynchronous " + reason + "!" ); diff --git a/patches/server/0016-Try-fixing-folia-spector-teleportation.patch b/patches/server/0018-Try-fixing-folia-spector-teleportation.patch similarity index 100% rename from patches/server/0016-Try-fixing-folia-spector-teleportation.patch rename to patches/server/0018-Try-fixing-folia-spector-teleportation.patch diff --git a/patches/server/0017-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0019-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from patches/server/0017-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to patches/server/0019-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/patches/server/0018-Try-fixing-folia-off-region-POI-accessing-issue.patch b/patches/server/0020-Try-fixing-folia-off-region-POI-accessing-issue.patch similarity index 100% rename from patches/server/0018-Try-fixing-folia-off-region-POI-accessing-issue.patch rename to patches/server/0020-Try-fixing-folia-off-region-POI-accessing-issue.patch diff --git a/patches/server/0019-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch similarity index 100% rename from patches/server/0019-Prevent-teleportAsync-calling-during-moving-event-be.patch rename to patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch diff --git a/patches/server/0020-Added-linear-region-format-from-LinearPurpur.patch b/patches/server/0022-Added-linear-region-format-from-LinearPurpur.patch similarity index 100% rename from patches/server/0020-Added-linear-region-format-from-LinearPurpur.patch rename to patches/server/0022-Added-linear-region-format-from-LinearPurpur.patch diff --git a/patches/server/0021-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0023-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0021-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0023-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0024-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0024-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/patches/server/0023-Petal-Reduce-sensor-work.patch b/patches/server/0025-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0023-Petal-Reduce-sensor-work.patch rename to patches/server/0025-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0024-Pufferfish-Optimize-entity-coordinate-key.patch b/patches/server/0026-Pufferfish-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0024-Pufferfish-Optimize-entity-coordinate-key.patch rename to patches/server/0026-Pufferfish-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0027-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0027-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/patches/server/0026-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch b/patches/server/0028-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch similarity index 100% rename from patches/server/0026-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch rename to patches/server/0028-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch diff --git a/patches/server/0027-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0029-Pufferfish-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0027-Pufferfish-Improve-fluid-direction-caching.patch rename to patches/server/0029-Pufferfish-Improve-fluid-direction-caching.patch diff --git a/patches/server/0028-Pufferfish-Optimize-suffocation.patch b/patches/server/0030-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0028-Pufferfish-Optimize-suffocation.patch rename to patches/server/0030-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0029-Pufferfish-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0031-Pufferfish-Use-aging-cache-for-biome-temperatures.patch similarity index 100% rename from patches/server/0029-Pufferfish-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0031-Pufferfish-Use-aging-cache-for-biome-temperatures.patch diff --git a/patches/server/0030-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/0030-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/0031-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0033-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0031-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0033-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0032-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0034-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/0034-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0033-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0035-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0033-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0035-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0036-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0036-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0035-Pufferfish-Skip-cloning-loot-parameters.patch b/patches/server/0037-Pufferfish-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0035-Pufferfish-Skip-cloning-loot-parameters.patch rename to patches/server/0037-Pufferfish-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0036-Pufferfish-Entity-TTL.patch b/patches/server/0038-Pufferfish-Entity-TTL.patch similarity index 100% rename from patches/server/0036-Pufferfish-Entity-TTL.patch rename to patches/server/0038-Pufferfish-Entity-TTL.patch diff --git a/patches/server/0037-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0039-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0037-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0039-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0038-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0040-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 100% rename from patches/server/0038-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0040-Pufferfish-Dynamic-Activation-of-Brain.patch diff --git a/patches/server/0039-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0041-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0039-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0041-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0040-Pufferfish-Reduce-entity-allocations.patch b/patches/server/0042-Pufferfish-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0040-Pufferfish-Reduce-entity-allocations.patch rename to patches/server/0042-Pufferfish-Reduce-entity-allocations.patch diff --git a/patches/server/0041-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0043-Pufferfish-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0041-Pufferfish-Improve-container-checking-with-a-bitset.patch rename to patches/server/0043-Pufferfish-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0042-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch b/patches/server/0044-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch similarity index 100% rename from patches/server/0042-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch rename to patches/server/0044-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch diff --git a/patches/server/0043-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0045-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0043-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0045-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0044-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0046-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0044-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0046-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0045-Gale-Optimize-sun-burn-tick.patch b/patches/server/0047-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0045-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0047-Gale-Optimize-sun-burn-tick.patch diff --git a/patches/server/0046-Gale-Check-frozen-ticks-before-landing-block.patch b/patches/server/0048-Gale-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0046-Gale-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0048-Gale-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0047-Gale-Use-platform-math-functions.patch b/patches/server/0049-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0047-Gale-Use-platform-math-functions.patch rename to patches/server/0049-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0048-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0050-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0048-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0050-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0049-Gale-Optimize-world-generation-chunk-and-block-acces.patch b/patches/server/0051-Gale-Optimize-world-generation-chunk-and-block-acces.patch similarity index 100% rename from patches/server/0049-Gale-Optimize-world-generation-chunk-and-block-acces.patch rename to patches/server/0051-Gale-Optimize-world-generation-chunk-and-block-acces.patch diff --git a/patches/server/0050-Gale-Optimize-noise-generation.patch b/patches/server/0052-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0050-Gale-Optimize-noise-generation.patch rename to patches/server/0052-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0051-Gale-Faster-chunk-serialization.patch b/patches/server/0053-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0051-Gale-Faster-chunk-serialization.patch rename to patches/server/0053-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0052-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0054-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0052-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0054-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0053-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0055-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0053-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0055-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0054-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0056-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 97% rename from patches/server/0054-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0056-Sparkly-Paper-Optimize-canSee-checks.patch index d43095c..ef4ed9b 100644 --- a/patches/server/0054-Sparkly-Paper-Optimize-canSee-checks.patch +++ b/patches/server/0056-Sparkly-Paper-Optimize-canSee-checks.patch @@ -18,7 +18,7 @@ index 4a0c5afd03dba788c40a71f00bc1fd0d4f0fc7e4..04f5efdc0d5729af5009e51a3e36ed7c } // 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 28583ad8117167400faf3ca0dc4bc9f3f44dbedb..a3d4dc232d011c262d85028351191ac2b8547398 100644 +index 730887465bf9ca380ef692b4c2d4a28bc6caaaa9..2e2c8d6fa55f3b58fb6e48de0c36b22d51b09653 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -198,7 +198,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0055-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0057-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0055-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0057-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0056-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0058-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0056-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0058-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0057-Purpur-use-alternative-keep-alive.patch b/patches/server/0059-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0057-Purpur-use-alternative-keep-alive.patch rename to patches/server/0059-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0058-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0060-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 100% rename from patches/server/0058-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0060-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch diff --git a/patches/server/0059-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0061-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0059-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0061-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0060-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0062-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0060-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0062-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0061-Fix-MC-2025.patch b/patches/server/0063-Fix-MC-2025.patch similarity index 100% rename from patches/server/0061-Fix-MC-2025.patch rename to patches/server/0063-Fix-MC-2025.patch diff --git a/patches/server/0062-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0064-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0062-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0064-FoliaPR-Add-TPS-From-Region.patch