From c4af5b30dcf5e16c68cc41a32a374f703cda2a21 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Sat, 12 Apr 2025 23:23:54 +0800 Subject: [PATCH] fix: fix up number --- ...0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch | 6 +++--- .../0019-Fix-uncorrected-death-check-of-folia.patch | 4 ++-- ...atch => 0022-Kaiiju-Don-t-pathfind-outside-region.patch} | 0 ...h => 0023-Kaiiju-Vanilla-end-portal-teleportation.patch} | 0 ...ch => 0024-Kaiiju-Entity-tick-and-removal-limiter.patch} | 0 ...e.patch => 0025-Purpur-Use-alternative-keep-alive.patch} | 6 +++--- ...s.patch => 0026-Purpur-Lobotomize-stuck-villagers.patch} | 0 ...ensor-work.patch => 0027-Petal-Reduce-sensor-work.patch} | 0 ...28-Pufferfish-Cache-climbing-check-for-activation.patch} | 0 ...h => 0029-Pufferfish-Reduce-chunk-loading-lookups.patch} | 0 ...ns.patch => 0030-Gale-Use-platform-math-functions.patch} | 0 ...tch => 0031-Gale-Variable-entity-wake-up-duration.patch} | 0 ...=> 0032-Gale-Skip-entity-move-if-movement-is-zero.patch} | 0 ...e-Replace-AI-attributes-with-optimized-collection.patch} | 0 ...tion.patch => 0034-Gale-Optimize-noise-generation.patch} | 0 ...patch => 0035-SparklyPaper-Optimize-canSee-checks.patch} | 0 ...rklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} | 0 ... => 0037-Leaf-Secure-seed-and-matter-seed-command.patch} | 0 ...f-Remove-useless-creating-stats-json-bases-on-pla.patch} | 6 +++--- ...Leaf-Replace-brain-maps-with-optimized-collection.patch} | 0 ...f-Paper-PR-Prevent-zombie-reinforcements-loading-.patch} | 0 ...2-Tick-regions-api.patch => 0041-Tick-regions-api.patch} | 0 ... => 0042-Add-missing-teleportation-apis-for-folia.patch} | 4 ++-- ...ch => 0043-Leaves-Disable-moved-wrongly-threshold.patch} | 2 +- ...ves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch} | 0 ...iment.patch => 0045-Raytracing-tracker-experiment.patch} | 0 ...tch => 0046-Purpur-Barrels-and-enderchests-6-rows.patch} | 2 +- ...ire-dupe.patch => 0047-Configurable-tripwire-dupe.patch} | 0 ...8-Add-force-the-data-command-to-be-enabled-config.patch} | 0 ...-changes.patch => 0049-Leaves-Revert-raid-changes.patch} | 0 30 files changed, 15 insertions(+), 15 deletions(-) rename luminol-server/minecraft-patches/features/{0023-Kaiiju-Don-t-pathfind-outside-region.patch => 0022-Kaiiju-Don-t-pathfind-outside-region.patch} (100%) rename luminol-server/minecraft-patches/features/{0024-Kaiiju-Vanilla-end-portal-teleportation.patch => 0023-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename luminol-server/minecraft-patches/features/{0025-Kaiiju-Entity-tick-and-removal-limiter.patch => 0024-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename luminol-server/minecraft-patches/features/{0026-Purpur-Use-alternative-keep-alive.patch => 0025-Purpur-Use-alternative-keep-alive.patch} (94%) rename luminol-server/minecraft-patches/features/{0027-Purpur-Lobotomize-stuck-villagers.patch => 0026-Purpur-Lobotomize-stuck-villagers.patch} (100%) rename luminol-server/minecraft-patches/features/{0028-Petal-Reduce-sensor-work.patch => 0027-Petal-Reduce-sensor-work.patch} (100%) rename luminol-server/minecraft-patches/features/{0029-Pufferfish-Cache-climbing-check-for-activation.patch => 0028-Pufferfish-Cache-climbing-check-for-activation.patch} (100%) rename luminol-server/minecraft-patches/features/{0030-Pufferfish-Reduce-chunk-loading-lookups.patch => 0029-Pufferfish-Reduce-chunk-loading-lookups.patch} (100%) rename luminol-server/minecraft-patches/features/{0031-Gale-Use-platform-math-functions.patch => 0030-Gale-Use-platform-math-functions.patch} (100%) rename luminol-server/minecraft-patches/features/{0032-Gale-Variable-entity-wake-up-duration.patch => 0031-Gale-Variable-entity-wake-up-duration.patch} (100%) rename luminol-server/minecraft-patches/features/{0033-Gale-Skip-entity-move-if-movement-is-zero.patch => 0032-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename luminol-server/minecraft-patches/features/{0034-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0033-Gale-Replace-AI-attributes-with-optimized-collection.patch} (100%) rename luminol-server/minecraft-patches/features/{0035-Gale-Optimize-noise-generation.patch => 0034-Gale-Optimize-noise-generation.patch} (100%) rename luminol-server/minecraft-patches/features/{0036-SparklyPaper-Optimize-canSee-checks.patch => 0035-SparklyPaper-Optimize-canSee-checks.patch} (100%) rename luminol-server/minecraft-patches/features/{0037-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0036-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename luminol-server/minecraft-patches/features/{0038-Leaf-Secure-seed-and-matter-seed-command.patch => 0037-Leaf-Secure-seed-and-matter-seed-command.patch} (100%) rename luminol-server/minecraft-patches/features/{0039-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch => 0038-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch} (85%) rename luminol-server/minecraft-patches/features/{0040-Leaf-Replace-brain-maps-with-optimized-collection.patch => 0039-Leaf-Replace-brain-maps-with-optimized-collection.patch} (100%) rename luminol-server/minecraft-patches/features/{0041-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch => 0040-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch} (100%) rename luminol-server/minecraft-patches/features/{0042-Tick-regions-api.patch => 0041-Tick-regions-api.patch} (100%) rename luminol-server/minecraft-patches/features/{0043-Add-missing-teleportation-apis-for-folia.patch => 0042-Add-missing-teleportation-apis-for-folia.patch} (98%) rename luminol-server/minecraft-patches/features/{0045-Leaves-Disable-moved-wrongly-threshold.patch => 0043-Leaves-Disable-moved-wrongly-threshold.patch} (97%) rename luminol-server/minecraft-patches/features/{0046-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch => 0044-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch} (100%) rename luminol-server/minecraft-patches/features/{0047-Raytracing-tracker-experiment.patch => 0045-Raytracing-tracker-experiment.patch} (100%) rename luminol-server/minecraft-patches/features/{0048-Purpur-Barrels-and-enderchests-6-rows.patch => 0046-Purpur-Barrels-and-enderchests-6-rows.patch} (99%) rename luminol-server/minecraft-patches/features/{0049-Configurable-tripwire-dupe.patch => 0047-Configurable-tripwire-dupe.patch} (100%) rename luminol-server/minecraft-patches/features/{0050-Add-force-the-data-command-to-be-enabled-config.patch => 0048-Add-force-the-data-command-to-be-enabled-config.patch} (100%) rename luminol-server/minecraft-patches/features/{0052-Leaves-Revert-raid-changes.patch => 0049-Leaves-Revert-raid-changes.patch} (100%) diff --git a/luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch b/luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch index 3eab36a..7821757 100644 --- a/luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch +++ b/luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch @@ -118,10 +118,10 @@ index f2d2ddfd964bff914e41c0b4150fe1aad7866ebf..7defcd15c44601bfd2f7f55046038693 } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 423534a1ff02bd0d0f9baacfe2428f45c7d9acb9..9fd3fe181df2ce6dbe695f6463d3940ac4c01167 100644 +index dbf9231b1f01576906b90a3ddf0bf2cbbeb4590a..b17ace9118c94a756fa2901621c6b2b9bd9e5764 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -393,7 +393,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -400,7 +400,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent public @Nullable String clientBrandName = null; // Paper - Brand support public 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 @@ -132,7 +132,7 @@ index 423534a1ff02bd0d0f9baacfe2428f45c7d9acb9..9fd3fe181df2ce6dbe695f6463d3940a // Paper start - rewrite chunk system private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; private final ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder viewDistanceHolder = new ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder(); -@@ -1006,8 +1008,35 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1013,8 +1015,35 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.trackEnteredOrExitedLavaOnVehicle(); this.updatePlayerAttributes(); this.advancements.flushDirty(this); diff --git a/luminol-server/minecraft-patches/features/0019-Fix-uncorrected-death-check-of-folia.patch b/luminol-server/minecraft-patches/features/0019-Fix-uncorrected-death-check-of-folia.patch index 292d061..87c435a 100644 --- a/luminol-server/minecraft-patches/features/0019-Fix-uncorrected-death-check-of-folia.patch +++ b/luminol-server/minecraft-patches/features/0019-Fix-uncorrected-death-check-of-folia.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix uncorrected death check of folia diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java -index 50af953a4698a3c6e16b840fab764dd733b3fbc9..a9c058238819f3631d94ac306185e909821caf35 100644 +index acca8c51d2030c675c157b10d0bbc6af631afe61..d0b688e69979c5e7b8267ac96bd71bcd33444c41 100644 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java -@@ -679,7 +679,7 @@ public abstract class AbstractContainerMenu { +@@ -689,7 +689,7 @@ public abstract class AbstractContainerMenu { } private static void dropOrPlaceInInventory(Player player, ItemStack stack) { diff --git a/luminol-server/minecraft-patches/features/0023-Kaiiju-Don-t-pathfind-outside-region.patch b/luminol-server/minecraft-patches/features/0022-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0023-Kaiiju-Don-t-pathfind-outside-region.patch rename to luminol-server/minecraft-patches/features/0022-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/luminol-server/minecraft-patches/features/0024-Kaiiju-Vanilla-end-portal-teleportation.patch b/luminol-server/minecraft-patches/features/0023-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0024-Kaiiju-Vanilla-end-portal-teleportation.patch rename to luminol-server/minecraft-patches/features/0023-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/luminol-server/minecraft-patches/features/0025-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/minecraft-patches/features/0024-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0025-Kaiiju-Entity-tick-and-removal-limiter.patch rename to luminol-server/minecraft-patches/features/0024-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/luminol-server/minecraft-patches/features/0026-Purpur-Use-alternative-keep-alive.patch b/luminol-server/minecraft-patches/features/0025-Purpur-Use-alternative-keep-alive.patch similarity index 94% rename from luminol-server/minecraft-patches/features/0026-Purpur-Use-alternative-keep-alive.patch rename to luminol-server/minecraft-patches/features/0025-Purpur-Use-alternative-keep-alive.patch index c867436..c5b2e3e 100644 --- a/luminol-server/minecraft-patches/features/0026-Purpur-Use-alternative-keep-alive.patch +++ b/luminol-server/minecraft-patches/features/0025-Purpur-Use-alternative-keep-alive.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Purpur Use alternative keep alive diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 6eca15223b92aedac74233db886e2c1248750e2c..7507f32b5f0f7fbbf35eeaaf03bf9d99694c1683 100644 +index 79fe336adf35f4f007461ed050e6301764fe7fc3..a5b805b98cf138eabfb06f4ff202462be60c2995 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -41,6 +41,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -33,7 +33,7 @@ index 6eca15223b92aedac74233db886e2c1248750e2c..7507f32b5f0f7fbbf35eeaaf03bf9d99 if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) { int i = (int)(Util.getMillis() - this.keepAliveTime); this.latency = (this.latency * 3 + i) / 4; -@@ -250,7 +261,22 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -254,7 +265,22 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack // Paper start - give clients a longer time to respond to pings as per pre 1.12.2 timings // This should effectively place the keepalive handling back to "as it was" before 1.12.2 final long elapsedTime = millis - this.keepAliveTime; @@ -57,7 +57,7 @@ index 6eca15223b92aedac74233db886e2c1248750e2c..7507f32b5f0f7fbbf35eeaaf03bf9d99 if (this.keepAlivePending) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected this.disconnect(TIMEOUT_DISCONNECTION_MESSAGE, org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause -@@ -263,6 +289,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -267,6 +293,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack this.send(new ClientboundKeepAlivePacket(this.keepAliveChallenge)); } } diff --git a/luminol-server/minecraft-patches/features/0027-Purpur-Lobotomize-stuck-villagers.patch b/luminol-server/minecraft-patches/features/0026-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0027-Purpur-Lobotomize-stuck-villagers.patch rename to luminol-server/minecraft-patches/features/0026-Purpur-Lobotomize-stuck-villagers.patch diff --git a/luminol-server/minecraft-patches/features/0028-Petal-Reduce-sensor-work.patch b/luminol-server/minecraft-patches/features/0027-Petal-Reduce-sensor-work.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0028-Petal-Reduce-sensor-work.patch rename to luminol-server/minecraft-patches/features/0027-Petal-Reduce-sensor-work.patch diff --git a/luminol-server/minecraft-patches/features/0029-Pufferfish-Cache-climbing-check-for-activation.patch b/luminol-server/minecraft-patches/features/0028-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0029-Pufferfish-Cache-climbing-check-for-activation.patch rename to luminol-server/minecraft-patches/features/0028-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/luminol-server/minecraft-patches/features/0030-Pufferfish-Reduce-chunk-loading-lookups.patch b/luminol-server/minecraft-patches/features/0029-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0030-Pufferfish-Reduce-chunk-loading-lookups.patch rename to luminol-server/minecraft-patches/features/0029-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/luminol-server/minecraft-patches/features/0031-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0030-Gale-Use-platform-math-functions.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0031-Gale-Use-platform-math-functions.patch rename to luminol-server/minecraft-patches/features/0030-Gale-Use-platform-math-functions.patch diff --git a/luminol-server/minecraft-patches/features/0032-Gale-Variable-entity-wake-up-duration.patch b/luminol-server/minecraft-patches/features/0031-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0032-Gale-Variable-entity-wake-up-duration.patch rename to luminol-server/minecraft-patches/features/0031-Gale-Variable-entity-wake-up-duration.patch diff --git a/luminol-server/minecraft-patches/features/0033-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0032-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0033-Gale-Skip-entity-move-if-movement-is-zero.patch rename to luminol-server/minecraft-patches/features/0032-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/luminol-server/minecraft-patches/features/0034-Gale-Replace-AI-attributes-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0033-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0034-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0033-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0035-Gale-Optimize-noise-generation.patch b/luminol-server/minecraft-patches/features/0034-Gale-Optimize-noise-generation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0035-Gale-Optimize-noise-generation.patch rename to luminol-server/minecraft-patches/features/0034-Gale-Optimize-noise-generation.patch diff --git a/luminol-server/minecraft-patches/features/0036-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/minecraft-patches/features/0035-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0036-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/minecraft-patches/features/0035-SparklyPaper-Optimize-canSee-checks.patch diff --git a/luminol-server/minecraft-patches/features/0037-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/luminol-server/minecraft-patches/features/0036-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0037-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to luminol-server/minecraft-patches/features/0036-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/luminol-server/minecraft-patches/features/0038-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/minecraft-patches/features/0037-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0038-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/minecraft-patches/features/0037-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/luminol-server/minecraft-patches/features/0039-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/luminol-server/minecraft-patches/features/0038-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 85% rename from luminol-server/minecraft-patches/features/0039-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to luminol-server/minecraft-patches/features/0038-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch index c3035c2..47bb296 100644 --- a/luminol-server/minecraft-patches/features/0039-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch +++ b/luminol-server/minecraft-patches/features/0038-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Leaf Remove useless creating stats json bases on player name diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 548f7a2b0b020ff7fff27396942cc0bc9e755afe..9bf6e8240bf15f08b037b18cfeae15ebb8ea934d 100644 +index 751b011701d6ae373099226ea63ffbafcd24ce6a..27478c973dc2e9ea2495f5b27127ef085bc5cdf3 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java -@@ -1411,6 +1411,8 @@ public abstract class PlayerList { +@@ -1416,6 +1416,8 @@ public abstract class PlayerList { if (serverStatsCounter == null) { File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile(); File file1 = new File(file, uuid + ".json"); @@ -18,7 +18,7 @@ index 548f7a2b0b020ff7fff27396942cc0bc9e755afe..9bf6e8240bf15f08b037b18cfeae15eb if (!file1.exists()) { File file2 = new File(file, displayName + ".json"); // CraftBukkit Path path = file2.toPath(); -@@ -1418,6 +1420,8 @@ public abstract class PlayerList { +@@ -1423,6 +1425,8 @@ public abstract class PlayerList { file2.renameTo(file1); } } diff --git a/luminol-server/minecraft-patches/features/0040-Leaf-Replace-brain-maps-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0039-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0040-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0039-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0041-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch b/luminol-server/minecraft-patches/features/0040-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0041-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch rename to luminol-server/minecraft-patches/features/0040-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch diff --git a/luminol-server/minecraft-patches/features/0042-Tick-regions-api.patch b/luminol-server/minecraft-patches/features/0041-Tick-regions-api.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0042-Tick-regions-api.patch rename to luminol-server/minecraft-patches/features/0041-Tick-regions-api.patch diff --git a/luminol-server/minecraft-patches/features/0043-Add-missing-teleportation-apis-for-folia.patch b/luminol-server/minecraft-patches/features/0042-Add-missing-teleportation-apis-for-folia.patch similarity index 98% rename from luminol-server/minecraft-patches/features/0043-Add-missing-teleportation-apis-for-folia.patch rename to luminol-server/minecraft-patches/features/0042-Add-missing-teleportation-apis-for-folia.patch index 7651c19..1e50fba 100644 --- a/luminol-server/minecraft-patches/features/0043-Add-missing-teleportation-apis-for-folia.patch +++ b/luminol-server/minecraft-patches/features/0042-Add-missing-teleportation-apis-for-folia.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add missing teleportation apis for folia diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 9fd3fe181df2ce6dbe695f6463d3940ac4c01167..822d401150d3764004b2570da828b4f69f19dcec 100644 +index b17ace9118c94a756fa2901621c6b2b9bd9e5764..8a728a3af515da522cd5fab1e731bbc0607f0596 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -1653,6 +1653,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1660,6 +1660,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc if (respawnComplete != null) { respawnComplete.accept(ServerPlayer.this); } diff --git a/luminol-server/minecraft-patches/features/0045-Leaves-Disable-moved-wrongly-threshold.patch b/luminol-server/minecraft-patches/features/0043-Leaves-Disable-moved-wrongly-threshold.patch similarity index 97% rename from luminol-server/minecraft-patches/features/0045-Leaves-Disable-moved-wrongly-threshold.patch rename to luminol-server/minecraft-patches/features/0043-Leaves-Disable-moved-wrongly-threshold.patch index 3c8efde..051ffe1 100644 --- a/luminol-server/minecraft-patches/features/0045-Leaves-Disable-moved-wrongly-threshold.patch +++ b/luminol-server/minecraft-patches/features/0043-Leaves-Disable-moved-wrongly-threshold.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Disable moved wrongly threshold diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a2fe9286d432909ba0cb3731a166514af768dc37..d60721767f94336eaba09b9bdb12a1420c264e49 100644 +index a107d9ee24d0e39ce3e3e09bf27af1ea4ae35b96..225045400f152a9a8f030d6fe367764b00d99b24 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -581,7 +581,7 @@ public class ServerGamePacketListenerImpl diff --git a/luminol-server/minecraft-patches/features/0046-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch b/luminol-server/minecraft-patches/features/0044-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0046-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch rename to luminol-server/minecraft-patches/features/0044-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch diff --git a/luminol-server/minecraft-patches/features/0047-Raytracing-tracker-experiment.patch b/luminol-server/minecraft-patches/features/0045-Raytracing-tracker-experiment.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0047-Raytracing-tracker-experiment.patch rename to luminol-server/minecraft-patches/features/0045-Raytracing-tracker-experiment.patch diff --git a/luminol-server/minecraft-patches/features/0048-Purpur-Barrels-and-enderchests-6-rows.patch b/luminol-server/minecraft-patches/features/0046-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 99% rename from luminol-server/minecraft-patches/features/0048-Purpur-Barrels-and-enderchests-6-rows.patch rename to luminol-server/minecraft-patches/features/0046-Purpur-Barrels-and-enderchests-6-rows.patch index 8094e9d..a16a6e8 100644 --- a/luminol-server/minecraft-patches/features/0048-Purpur-Barrels-and-enderchests-6-rows.patch +++ b/luminol-server/minecraft-patches/features/0046-Purpur-Barrels-and-enderchests-6-rows.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Purpur-Barrels-and-enderchests-6-rows diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 9bf6e8240bf15f08b037b18cfeae15ebb8ea934d..79e7fcb7949fbc8e3794d481e41d5164dea0b273 100644 +index 27478c973dc2e9ea2495f5b27127ef085bc5cdf3..9777a5b7ba9916e426ba87d6ee7cd56f0e43c195 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -1103,6 +1103,10 @@ public abstract class PlayerList { diff --git a/luminol-server/minecraft-patches/features/0049-Configurable-tripwire-dupe.patch b/luminol-server/minecraft-patches/features/0047-Configurable-tripwire-dupe.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0049-Configurable-tripwire-dupe.patch rename to luminol-server/minecraft-patches/features/0047-Configurable-tripwire-dupe.patch diff --git a/luminol-server/minecraft-patches/features/0050-Add-force-the-data-command-to-be-enabled-config.patch b/luminol-server/minecraft-patches/features/0048-Add-force-the-data-command-to-be-enabled-config.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0050-Add-force-the-data-command-to-be-enabled-config.patch rename to luminol-server/minecraft-patches/features/0048-Add-force-the-data-command-to-be-enabled-config.patch diff --git a/luminol-server/minecraft-patches/features/0052-Leaves-Revert-raid-changes.patch b/luminol-server/minecraft-patches/features/0049-Leaves-Revert-raid-changes.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0052-Leaves-Revert-raid-changes.patch rename to luminol-server/minecraft-patches/features/0049-Leaves-Revert-raid-changes.patch