From 4692867da85cd0e99aff53bccf29296f98440404 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Mon, 19 May 2025 19:47:11 +0800 Subject: [PATCH] [ci skip]refactor: resort patches --- ....patch => 0004-Add-config-for-username-check.patch} | 0 ... => 0005-Add-config-for-offline-mode-warning.patch} | 2 +- ...0006-Add-config-for-out-of-order-chat-checks.patch} | 0 ...nfig-to-verify-signature-only-in-online-mode.patch} | 0 ...8-Add-config-to-disable-entity-tick-catchers.patch} | 0 ...d-config-for-command-block-command-execution.patch} | 0 ...atch => 0010-Add-config-for-watchdog-timeout.patch} | 0 ...ig-for-entity-to-clean-memory-value-which-is.patch} | 0 ... 0012-Add-config-to-modify-tripwire-behavior.patch} | 10 ++++------ ...0013-Add-config-to-disable-heightmap-warning.patch} | 0 ...ch => 0014-Add-config-to-revert-raid-changes.patch} | 0 ...ch => 0015-Add-config-to-enable-tick-command.patch} | 6 +++--- ...igurable-region-format-framework-linear-v2-r.patch} | 2 +- ...x-for-off-region-adult-following-ai-behavior.patch} | 0 ...-force-the-data-command-to-be-enabled-config.patch} | 2 +- ...gions-api.patch => 0019-Add-tick-regions-api.patch} | 2 +- ...dd-tpsbar-with-chunkhot-membar-and-regionbar.patch} | 4 ++-- ...-async-if-entity-was-moving-to-another-regio.patch} | 0 ...-fixing-folia-off-region-POI-accessing-issue.patch} | 0 ...aper-11945-for-temporary-hopper-behavior-fix.patch} | 0 ...o-not-search-the-block-out-of-current-region.patch} | 0 ...e.patch => 0025-Correct-player-respawn-place.patch} | 0 ...6-Command-IllegalArgumentException-crash-fix.patch} | 0 ...king.patch => 0028-Fix-creative-item-picking.patch} | 0 ...=> 0029-Fix-uncorrected-death-check-of-folia.patch} | 0 ...ries-issue-around-entity-memory-typed-Global.patch} | 0 ...rrectly-synced-data-after-player-teleportati.patch} | 0 ...tch => 0032-Fix-off-tickregion-sync-teleport.patch} | 0 .../0038-Purpur-Barrels-and-enderchests-6-rows.patch | 2 +- 29 files changed, 14 insertions(+), 16 deletions(-) rename luminol-server/minecraft-patches/features/{0005-Add-config-for-username-check.patch => 0004-Add-config-for-username-check.patch} (100%) rename luminol-server/minecraft-patches/features/{0006-Add-config-for-offline-mode-warning.patch => 0005-Add-config-for-offline-mode-warning.patch} (93%) rename luminol-server/minecraft-patches/features/{0007-Add-config-for-out-of-order-chat-checks.patch => 0006-Add-config-for-out-of-order-chat-checks.patch} (100%) rename luminol-server/minecraft-patches/features/{0008-Add-config-to-verify-signature-only-in-online-mode.patch => 0007-Add-config-to-verify-signature-only-in-online-mode.patch} (100%) rename luminol-server/minecraft-patches/features/{0009-Add-config-to-disable-entity-tick-catchers.patch => 0008-Add-config-to-disable-entity-tick-catchers.patch} (100%) rename luminol-server/minecraft-patches/features/{0010-Add-config-for-command-block-command-execution.patch => 0009-Add-config-for-command-block-command-execution.patch} (100%) rename luminol-server/minecraft-patches/features/{0013-Add-config-for-watchdog-timeout.patch => 0010-Add-config-for-watchdog-timeout.patch} (100%) rename luminol-server/minecraft-patches/features/{0014-Add-config-for-entity-to-clean-memory-value-which-is.patch => 0011-Add-config-for-entity-to-clean-memory-value-which-is.patch} (100%) rename luminol-server/minecraft-patches/features/{0016-Add-config-to-modify-tripwire-behavior.patch => 0012-Add-config-to-modify-tripwire-behavior.patch} (95%) rename luminol-server/minecraft-patches/features/{0017-Add-config-to-disable-heightmap-warning.patch => 0013-Add-config-to-disable-heightmap-warning.patch} (100%) rename luminol-server/minecraft-patches/features/{0018-Add-config-to-revert-raid-changes.patch => 0014-Add-config-to-revert-raid-changes.patch} (100%) rename luminol-server/minecraft-patches/features/{0019-Add-config-to-enable-tick-command.patch => 0015-Add-config-to-enable-tick-command.patch} (97%) rename luminol-server/minecraft-patches/features/{0012-Add-configurable-region-format-framework-linear-v2-r.patch => 0016-Add-configurable-region-format-framework-linear-v2-r.patch} (99%) rename luminol-server/minecraft-patches/features/{0011-Add-fix-for-off-region-adult-following-ai-behavior.patch => 0017-Add-fix-for-off-region-adult-following-ai-behavior.patch} (100%) rename luminol-server/minecraft-patches/features/{0015-Add-force-the-data-command-to-be-enabled-config.patch => 0018-Add-force-the-data-command-to-be-enabled-config.patch} (92%) rename luminol-server/minecraft-patches/features/{0032-Tick-regions-api.patch => 0019-Add-tick-regions-api.patch} (99%) rename luminol-server/minecraft-patches/features/{0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch => 0020-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch} (98%) rename luminol-server/minecraft-patches/features/{0020-Teleport-async-if-entity-was-moving-to-another-regio.patch => 0021-Teleport-async-if-entity-was-moving-to-another-regio.patch} (100%) rename luminol-server/minecraft-patches/features/{0021-Try-fixing-folia-off-region-POI-accessing-issue.patch => 0022-Try-fixing-folia-off-region-POI-accessing-issue.patch} (100%) rename luminol-server/minecraft-patches/features/{0022-Merge-Paper-11945-for-temporary-hopper-behavior-fix.patch => 0023-Merge-Paper-11945-for-temporary-hopper-behavior-fix.patch} (100%) rename luminol-server/minecraft-patches/features/{0023-Do-not-search-the-block-out-of-current-region.patch => 0024-Do-not-search-the-block-out-of-current-region.patch} (100%) rename luminol-server/minecraft-patches/features/{0024-Correct-player-respawn-place.patch => 0025-Correct-player-respawn-place.patch} (100%) rename luminol-server/minecraft-patches/features/{0025-Command-IllegalArgumentException-crash-fix.patch => 0026-Command-IllegalArgumentException-crash-fix.patch} (100%) rename luminol-server/minecraft-patches/features/{0026-Fix-creative-item-picking.patch => 0028-Fix-creative-item-picking.patch} (100%) rename luminol-server/minecraft-patches/features/{0028-Fix-uncorrected-death-check-of-folia.patch => 0029-Fix-uncorrected-death-check-of-folia.patch} (100%) rename luminol-server/minecraft-patches/features/{0029-Fix-a-series-issue-around-entity-memory-typed-Global.patch => 0030-Fix-a-series-issue-around-entity-memory-typed-Global.patch} (100%) rename luminol-server/minecraft-patches/features/{0030-Fix-incorrectly-synced-data-after-player-teleportati.patch => 0031-Fix-incorrectly-synced-data-after-player-teleportati.patch} (100%) rename luminol-server/minecraft-patches/features/{0031-Fix-off-tickregion-sync-teleport.patch => 0032-Fix-off-tickregion-sync-teleport.patch} (100%) diff --git a/luminol-server/minecraft-patches/features/0005-Add-config-for-username-check.patch b/luminol-server/minecraft-patches/features/0004-Add-config-for-username-check.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0005-Add-config-for-username-check.patch rename to luminol-server/minecraft-patches/features/0004-Add-config-for-username-check.patch diff --git a/luminol-server/minecraft-patches/features/0006-Add-config-for-offline-mode-warning.patch b/luminol-server/minecraft-patches/features/0005-Add-config-for-offline-mode-warning.patch similarity index 93% rename from luminol-server/minecraft-patches/features/0006-Add-config-for-offline-mode-warning.patch rename to luminol-server/minecraft-patches/features/0005-Add-config-for-offline-mode-warning.patch index 51313e4..9816f0e 100644 --- a/luminol-server/minecraft-patches/features/0006-Add-config-for-offline-mode-warning.patch +++ b/luminol-server/minecraft-patches/features/0005-Add-config-for-offline-mode-warning.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for offline mode warning diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index 3abe2881e8a80bd6c128e96b976deebe3ada4678..a0a8b0c7d091f63f023f15a2620b03ae2126782e 100644 +index 375f4a59333ee1d75fb1acb8c2cbada7866bd48e..f4b738b05ec9488e20402efb6c935ff55d86adf2 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -285,7 +285,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/luminol-server/minecraft-patches/features/0007-Add-config-for-out-of-order-chat-checks.patch b/luminol-server/minecraft-patches/features/0006-Add-config-for-out-of-order-chat-checks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0007-Add-config-for-out-of-order-chat-checks.patch rename to luminol-server/minecraft-patches/features/0006-Add-config-for-out-of-order-chat-checks.patch diff --git a/luminol-server/minecraft-patches/features/0008-Add-config-to-verify-signature-only-in-online-mode.patch b/luminol-server/minecraft-patches/features/0007-Add-config-to-verify-signature-only-in-online-mode.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0008-Add-config-to-verify-signature-only-in-online-mode.patch rename to luminol-server/minecraft-patches/features/0007-Add-config-to-verify-signature-only-in-online-mode.patch diff --git a/luminol-server/minecraft-patches/features/0009-Add-config-to-disable-entity-tick-catchers.patch b/luminol-server/minecraft-patches/features/0008-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0009-Add-config-to-disable-entity-tick-catchers.patch rename to luminol-server/minecraft-patches/features/0008-Add-config-to-disable-entity-tick-catchers.patch diff --git a/luminol-server/minecraft-patches/features/0010-Add-config-for-command-block-command-execution.patch b/luminol-server/minecraft-patches/features/0009-Add-config-for-command-block-command-execution.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0010-Add-config-for-command-block-command-execution.patch rename to luminol-server/minecraft-patches/features/0009-Add-config-for-command-block-command-execution.patch diff --git a/luminol-server/minecraft-patches/features/0013-Add-config-for-watchdog-timeout.patch b/luminol-server/minecraft-patches/features/0010-Add-config-for-watchdog-timeout.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0013-Add-config-for-watchdog-timeout.patch rename to luminol-server/minecraft-patches/features/0010-Add-config-for-watchdog-timeout.patch diff --git a/luminol-server/minecraft-patches/features/0014-Add-config-for-entity-to-clean-memory-value-which-is.patch b/luminol-server/minecraft-patches/features/0011-Add-config-for-entity-to-clean-memory-value-which-is.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0014-Add-config-for-entity-to-clean-memory-value-which-is.patch rename to luminol-server/minecraft-patches/features/0011-Add-config-for-entity-to-clean-memory-value-which-is.patch diff --git a/luminol-server/minecraft-patches/features/0016-Add-config-to-modify-tripwire-behavior.patch b/luminol-server/minecraft-patches/features/0012-Add-config-to-modify-tripwire-behavior.patch similarity index 95% rename from luminol-server/minecraft-patches/features/0016-Add-config-to-modify-tripwire-behavior.patch rename to luminol-server/minecraft-patches/features/0012-Add-config-to-modify-tripwire-behavior.patch index ef6bceb..cd6d2ec 100644 --- a/luminol-server/minecraft-patches/features/0016-Add-config-to-modify-tripwire-behavior.patch +++ b/luminol-server/minecraft-patches/features/0012-Add-config-to-modify-tripwire-behavior.patch @@ -31,10 +31,10 @@ index 9aace993c6c18f1a50610e4766225485984b8167..419c1c7e14691a472b70ed548ecb928c } } diff --git a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java -index f96fc1391167dea48cac1caa464b9026657df89a..eb869e574cee0d206684d5585c664a5f1d01ab65 100644 +index f96fc1391167dea48cac1caa464b9026657df89a..bfcca7f446d1667a857f565bae8bf1cfb1e39e2e 100644 --- a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java +++ b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java -@@ -27,15 +27,43 @@ public class EndPlatformFeature extends Feature { +@@ -27,15 +27,41 @@ public class EndPlatformFeature extends Feature { // CraftBukkit end BlockPos.MutableBlockPos mutableBlockPos = pos.mutable(); @@ -70,9 +70,7 @@ index f96fc1391167dea48cac1caa464b9026657df89a..eb869e574cee0d206684d5585c664a5f + } + } + } -+ default: { -+ -+ } // Luminol - 1.21 Logic - default empty ++ default: {} // Luminol - 1.21 & default Logic - default empty + } + } + if (flag) blockList1.add(blockPos.immutable()); @@ -80,7 +78,7 @@ index f96fc1391167dea48cac1caa464b9026657df89a..eb869e574cee0d206684d5585c664a5f } blockList.setBlock(blockPos, block.defaultBlockState(), 3); -@@ -54,11 +82,39 @@ public class EndPlatformFeature extends Feature { +@@ -54,11 +80,39 @@ public class EndPlatformFeature extends Feature { if (portalEvent.isCancelled()) return; } diff --git a/luminol-server/minecraft-patches/features/0017-Add-config-to-disable-heightmap-warning.patch b/luminol-server/minecraft-patches/features/0013-Add-config-to-disable-heightmap-warning.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0017-Add-config-to-disable-heightmap-warning.patch rename to luminol-server/minecraft-patches/features/0013-Add-config-to-disable-heightmap-warning.patch diff --git a/luminol-server/minecraft-patches/features/0018-Add-config-to-revert-raid-changes.patch b/luminol-server/minecraft-patches/features/0014-Add-config-to-revert-raid-changes.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0018-Add-config-to-revert-raid-changes.patch rename to luminol-server/minecraft-patches/features/0014-Add-config-to-revert-raid-changes.patch diff --git a/luminol-server/minecraft-patches/features/0019-Add-config-to-enable-tick-command.patch b/luminol-server/minecraft-patches/features/0015-Add-config-to-enable-tick-command.patch similarity index 97% rename from luminol-server/minecraft-patches/features/0019-Add-config-to-enable-tick-command.patch rename to luminol-server/minecraft-patches/features/0015-Add-config-to-enable-tick-command.patch index 004af27..ba7f46b 100644 --- a/luminol-server/minecraft-patches/features/0019-Add-config-to-enable-tick-command.patch +++ b/luminol-server/minecraft-patches/features/0015-Add-config-to-enable-tick-command.patch @@ -97,10 +97,10 @@ index 7123b3eb2f2e52946b8ef9de993a6828eb0bb6f7..82948984404a183711588932a4a026dc this.scheduler.regionFailed(this, false, thr); // regionFailed will schedule a shutdown, so we should avoid letting this region tick further diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index cfb37f2e428605965a37dc1eb83f302fe1bd6299..8f7b28e5688252207ad8ce9f3fb6f9c3b65d1adc 100644 +index 009e6405a11a391adca41a7c4ecafbf3254d799d..779dfa95d91ec4661227c94b012cb63953d4ba96 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java -@@ -213,7 +213,11 @@ public class Commands { +@@ -211,7 +211,11 @@ public class Commands { //TeamMsgCommand.register(this.dispatcher); // Folia - region threading - TODO later TeleportCommand.register(this.dispatcher); TellRawCommand.register(this.dispatcher, context); @@ -114,7 +114,7 @@ index cfb37f2e428605965a37dc1eb83f302fe1bd6299..8f7b28e5688252207ad8ce9f3fb6f9c3 TitleCommand.register(this.dispatcher, context); //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index ed00a29daccfee1d631bef27c0a3a4ae83140018..56f5568848d0f20b4d706c07dc8114594e0b5337 100644 +index 46375fa81b36b89b79c22f0a7ac6d610ab1183d4..2f0a1810e3ab4ff4376e893af7ceb2bf5849ba76 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -267,7 +267,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Date: Mon, 27 Jan 2025 13:01:55 +0800 -Subject: [PATCH] Tick regions api +Subject: [PATCH] Add tick regions api diff --git a/io/papermc/paper/threadedregions/ThreadedRegionizer.java b/io/papermc/paper/threadedregions/ThreadedRegionizer.java diff --git a/luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch b/luminol-server/minecraft-patches/features/0020-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch similarity index 98% rename from luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch rename to luminol-server/minecraft-patches/features/0020-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch index 4750d62..dbe1f51 100644 --- a/luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch +++ b/luminol-server/minecraft-patches/features/0020-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch @@ -17,7 +17,7 @@ index 8d67b4629c69d3039b199aaad45533d1acde114e..f7bfeca4b11b9860241d5eb80b6df420 ((ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickServerLevel)(ServerLevel)chunk.getLevel()).moonrise$removeChunkForPlayerTicking(chunk); // Moonrise - chunk tick iteration } diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 46375fa81b36b89b79c22f0a7ac6d610ab1183d4..f2124edb487b1d5f6bdc7fa086814f870724363a 100644 +index 27782d1096dc4c9c82c02c29e9b17e2bf8d3f4d3..56f5568848d0f20b4d706c07dc8114594e0b5337 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1665,7 +1665,44 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Date: Thu, 20 Feb 2025 01:00:28 +0800 -Subject: [PATCH] Purpur-Barrels-and-enderchests-6-rows +Subject: [PATCH] Purpur Barrels and enderchests 6 rows diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java