diff --git a/patches/server/0006-Add-config-for-unsafe-teleportation.patch b/patches/server/0005-Add-config-for-unsafe-teleportation.patch similarity index 100% rename from patches/server/0006-Add-config-for-unsafe-teleportation.patch rename to patches/server/0005-Add-config-for-unsafe-teleportation.patch diff --git a/patches/server/0005-Add-config-for-void-trading.patch b/patches/server/0005-Add-config-for-void-trading.patch deleted file mode 100644 index cfd5101..0000000 --- a/patches/server/0005-Add-config-for-void-trading.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Wed, 31 Jul 2024 12:01:17 +0800 -Subject: [PATCH] Add config for void trading - - -diff --git a/src/main/java/me/earthme/luminol/config/modules/fixes/VoidTradingFixConfig.java b/src/main/java/me/earthme/luminol/config/modules/fixes/VoidTradingFixConfig.java -new file mode 100644 -index 0000000000000000000000000000000000000000..22f3c6c70e4287f1bdd0b18f87f57efeb20140a2 ---- /dev/null -+++ b/src/main/java/me/earthme/luminol/config/modules/fixes/VoidTradingFixConfig.java -@@ -0,0 +1,20 @@ -+package me.earthme.luminol.config.modules.fixes; -+ -+import me.earthme.luminol.config.ConfigInfo; -+import me.earthme.luminol.config.EnumConfigCategory; -+import me.earthme.luminol.config.IConfigModule; -+ -+public class VoidTradingFixConfig implements IConfigModule { -+ @ConfigInfo(baseName = "enabled") -+ public static boolean enabled = false; -+ -+ @Override -+ public EnumConfigCategory getCategory() { -+ return EnumConfigCategory.FIXES; -+ } -+ -+ @Override -+ public String getBaseName() { -+ return "allow_void_trading"; -+ } -+} -diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 07037eb601f9dcae2cad5f3e3d5f9a0ac142b68a..66728181f92a900f4d3c667c2b963e3178bdcf02 100644 ---- a/src/main/java/net/minecraft/server/level/ServerLevel.java -+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2917,7 +2917,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe - // Spigot Start - if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message - // Paper start - Fix merchant inventory not closing on entity removal -- if (entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) { -+ if (!me.earthme.luminol.config.modules.fixes.VoidTradingFixConfig.enabled && (entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null)) { // Luminol - Add config for void trading - merchant.getTrader().closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); - } - // Paper end - Fix merchant inventory not closing on entity removal diff --git a/patches/server/0007-Add-config-for-vanilla-random.patch b/patches/server/0006-Add-config-for-vanilla-random.patch similarity index 95% rename from patches/server/0007-Add-config-for-vanilla-random.patch rename to patches/server/0006-Add-config-for-vanilla-random.patch index 618b1d7..7f7139b 100644 --- a/patches/server/0007-Add-config-for-vanilla-random.patch +++ b/patches/server/0006-Add-config-for-vanilla-random.patch @@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..0e6bfc03be660415c333024b56ac6565 + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 451d4cf162e39acd7ed215f82a5a84f6be6e166a..d98a86e911c6b6bc181d5148e806e2452cb1c6f4 100644 +index 20fe53cc8e9edfc7b7d50f23379e0044e520c84d..eeb094265756e5440c0cdd0784f725f7de536493 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -590,7 +590,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0008-Add-config-for-chat-sign.patch b/patches/server/0007-Add-config-for-chat-sign.patch similarity index 97% rename from patches/server/0008-Add-config-for-chat-sign.patch rename to patches/server/0007-Add-config-for-chat-sign.patch index 203bb9e..3e6df2e 100644 --- a/patches/server/0008-Add-config-for-chat-sign.patch +++ b/patches/server/0007-Add-config-for-chat-sign.patch @@ -53,7 +53,7 @@ index 479e6e2aa88a22ef7f8fccb06add6806f5b71d9d..22dae23a0c2fa4c85befd670637b1e59 buf.writeCollection(this.entries, (buf2, entry) -> entry.write(buf2)); } diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java -index aafeb9c61ddba6a8671f0238eda47b227619f1af..dc00ad0cc7f0c5c069a8d15dfdc926f2a1487319 100644 +index a523a83aec3a6ecbec4d60a187edc0c0167d15b4..324df3cce3f5a1ab6b4d2acfbb8e80aa551870d7 100644 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java @@ -129,6 +129,16 @@ public class FriendlyByteBuf extends ByteBuf { diff --git a/patches/server/0009-Add-a-simple-tpsbar.patch b/patches/server/0008-Add-a-simple-tpsbar.patch similarity index 100% rename from patches/server/0009-Add-a-simple-tpsbar.patch rename to patches/server/0008-Add-a-simple-tpsbar.patch diff --git a/patches/server/0010-Add-a-simple-membar.patch b/patches/server/0009-Add-a-simple-membar.patch similarity index 100% rename from patches/server/0010-Add-a-simple-membar.patch rename to patches/server/0009-Add-a-simple-membar.patch diff --git a/patches/server/0011-Add-config-for-username-check.patch b/patches/server/0010-Add-config-for-username-check.patch similarity index 100% rename from patches/server/0011-Add-config-for-username-check.patch rename to patches/server/0010-Add-config-for-username-check.patch diff --git a/patches/server/0012-Add-config-for-offline-mode-warning.patch b/patches/server/0011-Add-config-for-offline-mode-warning.patch similarity index 100% rename from patches/server/0012-Add-config-for-offline-mode-warning.patch rename to patches/server/0011-Add-config-for-offline-mode-warning.patch diff --git a/patches/server/0013-Add-config-for-out-of-order-chat-checks.patch b/patches/server/0012-Add-config-for-out-of-order-chat-checks.patch similarity index 100% rename from patches/server/0013-Add-config-for-out-of-order-chat-checks.patch rename to patches/server/0012-Add-config-for-out-of-order-chat-checks.patch diff --git a/patches/server/0014-Add-config-to-verify-signature-only-in-online-mode.patch b/patches/server/0013-Add-config-to-verify-signature-only-in-online-mode.patch similarity index 97% rename from patches/server/0014-Add-config-to-verify-signature-only-in-online-mode.patch rename to patches/server/0013-Add-config-to-verify-signature-only-in-online-mode.patch index 4065512..ccd262f 100644 --- a/patches/server/0014-Add-config-to-verify-signature-only-in-online-mode.patch +++ b/patches/server/0013-Add-config-to-verify-signature-only-in-online-mode.patch @@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..e45ce3abf49684c911678abcefd69586 + } +} diff --git a/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java b/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java -index 2fa51c3a70f43cd23b8f494fc643d66cecfda7d2..2c541f300ea1657e2d75d0eeb36809aaf437b205 100644 +index 6a7d7fad990fc44fdda6849d43dad141e61f7f37..dd470577fe314154b5a3677851eef95ebd151721 100644 --- a/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java +++ b/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java @@ -9,12 +9,15 @@ import java.time.Duration; diff --git a/patches/server/0015-Add-config-to-disable-entity-tick-catchers.patch b/patches/server/0014-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from patches/server/0015-Add-config-to-disable-entity-tick-catchers.patch rename to patches/server/0014-Add-config-to-disable-entity-tick-catchers.patch diff --git a/patches/server/0016-Add-config-to-disable-async-catchers.patch b/patches/server/0015-Add-config-to-disable-async-catchers.patch similarity index 98% rename from patches/server/0016-Add-config-to-disable-async-catchers.patch rename to patches/server/0015-Add-config-to-disable-async-catchers.patch index 656a8af..2394015 100644 --- a/patches/server/0016-Add-config-to-disable-async-catchers.patch +++ b/patches/server/0015-Add-config-to-disable-async-catchers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to disable async catchers diff --git a/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java b/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java -index 7d626bec6f0a4497026de6c0311e27cf95cfd757..2760e66046a37327d279a5bcdfb56a5b073b82a5 100644 +index 301cc1c0d91f5e755f74ace60dbe5551240b496d..2befb04b18cbdcc854437dfc534832ae02e70ee6 100644 --- a/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java +++ b/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java @@ -26,49 +26,49 @@ public class TickThread extends Thread { diff --git a/patches/server/0017-Add-experiment-config-for-command-block-command-exec.patch b/patches/server/0016-Add-experiment-config-for-command-block-command-exec.patch similarity index 95% rename from patches/server/0017-Add-experiment-config-for-command-block-command-exec.patch rename to patches/server/0016-Add-experiment-config-for-command-block-command-exec.patch index 4714bc5..726b3a4 100644 --- a/patches/server/0017-Add-experiment-config-for-command-block-command-exec.patch +++ b/patches/server/0016-Add-experiment-config-for-command-block-command-exec.patch @@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..3eafc59cc015569d3da8b1d8c4bfd046 + } +} 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 +index ccf476d1ed22cf992e3cbca6a375d36f85a82fa8..81f69938ccc72522090c4bee1a941c0de8054feb 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 { diff --git a/patches/server/0018-Try-fixing-folia-spector-teleportation.patch b/patches/server/0017-Try-fixing-folia-spector-teleportation.patch similarity index 100% rename from patches/server/0018-Try-fixing-folia-spector-teleportation.patch rename to patches/server/0017-Try-fixing-folia-spector-teleportation.patch diff --git a/patches/server/0019-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0018-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from patches/server/0019-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to patches/server/0018-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/patches/server/0020-Try-fixing-folia-off-region-POI-accessing-issue.patch b/patches/server/0019-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/0019-Try-fixing-folia-off-region-POI-accessing-issue.patch diff --git a/patches/server/0021-Force-disable-builtin-spark-plugin.patch b/patches/server/0020-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from patches/server/0021-Force-disable-builtin-spark-plugin.patch rename to patches/server/0020-Force-disable-builtin-spark-plugin.patch diff --git a/patches/server/0022-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0021-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0022-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0021-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0023-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from patches/server/0023-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/patches/server/0024-Kaiiju-Entity-tick-and-removal-limiter.patch b/patches/server/0023-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 99% rename from patches/server/0024-Kaiiju-Entity-tick-and-removal-limiter.patch rename to patches/server/0023-Kaiiju-Entity-tick-and-removal-limiter.patch index 4372c12..546b630 100644 --- a/patches/server/0024-Kaiiju-Entity-tick-and-removal-limiter.patch +++ b/patches/server/0023-Kaiiju-Entity-tick-and-removal-limiter.patch @@ -295,7 +295,7 @@ index 0000000000000000000000000000000000000000..038d9ab60cfac7e40e7c0c0644fa0a0d + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 66728181f92a900f4d3c667c2b963e3178bdcf02..992c4f2ed859570514e93d863a3fd64b7cadd209 100644 +index 07037eb601f9dcae2cad5f3e3d5f9a0ac142b68a..5503d506c595296ecad09a3ce4497a365f216af5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -811,6 +811,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/patches/server/0025-Petal-Reduce-sensor-work.patch b/patches/server/0024-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0025-Petal-Reduce-sensor-work.patch rename to patches/server/0024-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/patches/server/0027-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0026-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0027-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0026-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0027-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0027-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0029-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0028-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 97% rename from patches/server/0029-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0028-Pufferfish-Reduce-projectile-chunk-loading.patch index f64b227..4246ad4 100644 --- a/patches/server/0029-Pufferfish-Reduce-projectile-chunk-loading.patch +++ b/patches/server/0028-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 522fa33311b433f8c0eff4cb10dd80128f3c96d7..3a832be7d14276f38f1a35ca9f9a540be7b7d1b4 100644 +index a6bcf7b57b804af74f75c0b24ff48ee2714c3b73..7ccd7d6dc61948210ecb9c3acee8f1740e389106 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -58,6 +58,40 @@ public abstract class Projectile extends Entity implements TraceableEntity { diff --git a/patches/server/0030-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0029-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0030-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0029-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0031-Pufferfish-Optimize-suffocation.patch b/patches/server/0030-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0031-Pufferfish-Optimize-suffocation.patch rename to patches/server/0030-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0031-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 99% rename from patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0031-Pufferfish-Dynamic-Activation-of-Brain.patch index 80cad6f..5d86643 100644 --- a/patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch +++ b/patches/server/0031-Pufferfish-Dynamic-Activation-of-Brain.patch @@ -71,7 +71,7 @@ index 0000000000000000000000000000000000000000..af5893ba1f738ec9827d7b714682c314 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 992c4f2ed859570514e93d863a3fd64b7cadd209..39a3e0d6c8c191b5ff8c897580f4ac0d8181a025 100644 +index 5503d506c595296ecad09a3ce4497a365f216af5..98aef7a3cfc759e4415df3a56b5fe01eb50b0428 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -816,6 +816,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/patches/server/0033-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0032-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0033-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0032-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0034-Pufferfish-SIMD-Utilities.patch b/patches/server/0033-Pufferfish-SIMD-Utilities.patch similarity index 100% rename from patches/server/0034-Pufferfish-SIMD-Utilities.patch rename to patches/server/0033-Pufferfish-SIMD-Utilities.patch diff --git a/patches/server/0035-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0034-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0035-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0034-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0036-Gale-Optimize-sun-burn-tick.patch b/patches/server/0035-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0036-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0035-Gale-Optimize-sun-burn-tick.patch diff --git a/patches/server/0037-Gale-Use-platform-math-functions.patch b/patches/server/0036-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0037-Gale-Use-platform-math-functions.patch rename to patches/server/0036-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0038-Gale-Optimize-noise-generation.patch b/patches/server/0037-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0038-Gale-Optimize-noise-generation.patch rename to patches/server/0037-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0039-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0038-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0039-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0038-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0040-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0039-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0040-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0039-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0040-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0040-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0042-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0041-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0042-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0041-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0043-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0042-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0043-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0042-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0044-SparklyPaper-Skip-distanceToSqr-call-in.patch b/patches/server/0043-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 96% rename from patches/server/0044-SparklyPaper-Skip-distanceToSqr-call-in.patch rename to patches/server/0043-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch index 2cdd17b..d7ca48f 100644 --- a/patches/server/0044-SparklyPaper-Skip-distanceToSqr-call-in.patch +++ b/patches/server/0043-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Wed, 4 Dec 2024 23:51:38 +0800 -Subject: [PATCH] SparklyPaper Skip "distanceToSqr" call in +Subject: [PATCH] SparklyPaper Skip "distanceToSqr" call in "ServerEntity#sendChanges" if the delta movement hasn't changed diff --git a/patches/server/0045-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0044-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 99% rename from patches/server/0045-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0044-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch index c86e346..b2932be 100644 --- a/patches/server/0045-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch +++ b/patches/server/0044-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch @@ -234,7 +234,7 @@ index 67245811b15d6dfc0626e1d6ca874a901e565c3c..310c5f76e936d4af561f4effbaae4787 final ProfilerFiller profiler = Profiler.get(); int playerSaveInterval = io.papermc.paper.configuration.GlobalConfiguration.get().playerAutoSave.rate; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 39a3e0d6c8c191b5ff8c897580f4ac0d8181a025..5a17c520d48cf60cf1d29d60cb33929eae56536a 100644 +index 98aef7a3cfc759e4415df3a56b5fe01eb50b0428..f8dfaa6170962f5b06a0a8ccbf3d8677381babcf 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1382,6 +1382,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/patches/server/0046-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0045-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0046-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0045-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0047-Purpur-use-alternative-keep-alive.patch b/patches/server/0046-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0047-Purpur-use-alternative-keep-alive.patch rename to patches/server/0046-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0048-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0047-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0048-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0047-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0049-Fix-MC-2025.patch b/patches/server/0048-Fix-MC-2025.patch similarity index 100% rename from patches/server/0049-Fix-MC-2025.patch rename to patches/server/0048-Fix-MC-2025.patch diff --git a/patches/server/0050-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0049-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0050-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0049-FoliaPR-Add-TPS-From-Region.patch