From c46c70db18921c2527ffd8f7d07f152928069d80 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Mon, 19 May 2025 22:55:10 +0800 Subject: [PATCH] [ci skip]refactor: add some license and resort patches --- ...for-command-block-command-execution.patch} | 0 ...tity-to-clean-memory-value-which-is.patch} | 0 ...Add-config-for-offline-mode-warning.patch} | 0 ...config-for-out-of-order-chat-checks.patch} | 0 ...0005-Add-config-for-server-mod-name.patch} | 0 ...Add-config-for-unsafe-teleportation.patch} | 0 ... 0007-Add-config-for-username-check.patch} | 0 ... 0008-Add-config-for-vanilla-random.patch} | 0 ...009-Add-config-for-watchdog-timeout.patch} | 0 ...fig-to-disable-entity-tick-catchers.patch} | 0 ...config-to-disable-heightmap-warning.patch} | 0 ...2-Add-config-to-enable-tick-command.patch} | 0 ...-config-to-modify-tripwire-behavior.patch} | 11 +- ...erify-signature-only-in-online-mode.patch} | 0 ...> 0023-Correct-player-respawn-place.patch} | 0 ...-IllegalArgumentException-crash-fix.patch} | 0 ...rch-the-block-out-of-current-region.patch} | 0 ...-Force-disable-builtin-spark-plugin.patch} | 0 ... 0027-Fix-creative-player-item-pick.patch} | 6 +- ...e-around-entity-memory-typed-Global.patch} | 0 ...ynced-data-after-player-teleportati.patch} | 0 ...30-Fix-off-tickregion-sync-teleport.patch} | 0 ...ix-uncorrected-death-check-of-folia.patch} | 0 ...h => 0032-Paper-Hopper-behavior-fix.patch} | 8 +- ...ombie-reinforcements-loading-chunks.patch} | 7 +- ...aiiju-Don-t-pathfind-outside-region.patch} | 5 +- ...iiju-Entity-tick-and-removal-limiter.patch | 5 +- ...ju-Vanilla-end-portal-teleportation.patch} | 5 +- ...ch => 0037-Petal-Reduce-sensor-work.patch} | 5 +- ...urpur-Barrels-and-enderchests-6-rows.patch | 5 +- ...9-Purpur-Lobotomize-stuck-villagers.patch} | 5 +- ...0-Purpur-Use-alternative-keep-alive.patch} | 4 +- ...Cache-climbing-check-for-activation.patch} | 5 +- ...042-Gale-Use-platform-math-functions.patch | 159 ------------------ ...erfish-Reduce-chunk-loading-lookups.patch} | 5 +- ...043-Gale-Faster-chunk-serialization.patch} | 5 +- ...0044-Gale-Optimize-noise-generation.patch} | 5 +- ...attributes-with-optimized-collection.patch | 5 +- ...kip-entity-move-if-movement-is-zero.patch} | 5 +- ...047-Gale-Use-platform-math-functions.patch | 68 ++++++++ ...le-Variable-entity-wake-up-duration.patch} | 5 +- ...SparklyPaper-Optimize-canSee-checks.patch} | 4 +- ...-distanceToSqr-call-in-ServerEntity.patch} | 4 +- ...rain-maps-with-optimized-collection.patch} | 6 +- ...ss-creating-stats-json-bases-on-pla.patch} | 6 +- ...Secure-seed-and-matter-seed-command.patch} | 8 +- ...aves-Disable-moved-wrongly-threshold.patch | 4 +- ...rect-Collision-Behavior-for-Block-Sh.patch | 4 +- ...58-Leaves-Fix-SculkCatalyst-exp-skip.patch | 8 +- ...to-enable-Cross-Region-Damage-trace.patch} | 0 ...config-to-enable-Raytracing-tracker.patch} | 1 - 51 files changed, 165 insertions(+), 208 deletions(-) rename luminol-server/minecraft-patches/features/{0009-Add-config-for-command-block-command-execution.patch => 0001-Add-config-for-command-block-command-execution.patch} (100%) rename luminol-server/minecraft-patches/features/{0011-Add-config-for-entity-to-clean-memory-value-which-is.patch => 0002-Add-config-for-entity-to-clean-memory-value-which-is.patch} (100%) rename luminol-server/minecraft-patches/features/{0005-Add-config-for-offline-mode-warning.patch => 0003-Add-config-for-offline-mode-warning.patch} (100%) rename luminol-server/minecraft-patches/features/{0006-Add-config-for-out-of-order-chat-checks.patch => 0004-Add-config-for-out-of-order-chat-checks.patch} (100%) rename luminol-server/minecraft-patches/features/{0001-Add-config-for-server-mod-name.patch => 0005-Add-config-for-server-mod-name.patch} (100%) rename luminol-server/minecraft-patches/features/{0002-Add-config-for-unsafe-teleportation.patch => 0006-Add-config-for-unsafe-teleportation.patch} (100%) rename luminol-server/minecraft-patches/features/{0004-Add-config-for-username-check.patch => 0007-Add-config-for-username-check.patch} (100%) rename luminol-server/minecraft-patches/features/{0003-Add-config-for-vanilla-random.patch => 0008-Add-config-for-vanilla-random.patch} (100%) rename luminol-server/minecraft-patches/features/{0010-Add-config-for-watchdog-timeout.patch => 0009-Add-config-for-watchdog-timeout.patch} (100%) rename luminol-server/minecraft-patches/features/{0008-Add-config-to-disable-entity-tick-catchers.patch => 0010-Add-config-to-disable-entity-tick-catchers.patch} (100%) rename luminol-server/minecraft-patches/features/{0013-Add-config-to-disable-heightmap-warning.patch => 0011-Add-config-to-disable-heightmap-warning.patch} (100%) rename luminol-server/minecraft-patches/features/{0015-Add-config-to-enable-tick-command.patch => 0012-Add-config-to-enable-tick-command.patch} (100%) rename luminol-server/minecraft-patches/features/{0012-Add-config-to-modify-tripwire-behavior.patch => 0013-Add-config-to-modify-tripwire-behavior.patch} (94%) rename luminol-server/minecraft-patches/features/{0007-Add-config-to-verify-signature-only-in-online-mode.patch => 0015-Add-config-to-verify-signature-only-in-online-mode.patch} (100%) rename luminol-server/minecraft-patches/features/{0025-Correct-player-respawn-place.patch => 0023-Correct-player-respawn-place.patch} (100%) rename luminol-server/minecraft-patches/features/{0026-Command-IllegalArgumentException-crash-fix.patch => 0024-Command-IllegalArgumentException-crash-fix.patch} (100%) rename luminol-server/minecraft-patches/features/{0024-Do-not-search-the-block-out-of-current-region.patch => 0025-Do-not-search-the-block-out-of-current-region.patch} (100%) rename luminol-server/minecraft-patches/features/{0027-Force-disable-builtin-spark-plugin.patch => 0026-Force-disable-builtin-spark-plugin.patch} (100%) rename luminol-server/minecraft-patches/features/{0028-Fix-creative-item-picking.patch => 0027-Fix-creative-player-item-pick.patch} (83%) rename luminol-server/minecraft-patches/features/{0030-Fix-a-series-issue-around-entity-memory-typed-Global.patch => 0028-Fix-a-series-issue-around-entity-memory-typed-Global.patch} (100%) rename luminol-server/minecraft-patches/features/{0031-Fix-incorrectly-synced-data-after-player-teleportati.patch => 0029-Fix-incorrectly-synced-data-after-player-teleportati.patch} (100%) rename luminol-server/minecraft-patches/features/{0032-Fix-off-tickregion-sync-teleport.patch => 0030-Fix-off-tickregion-sync-teleport.patch} (100%) rename luminol-server/minecraft-patches/features/{0029-Fix-uncorrected-death-check-of-folia.patch => 0031-Fix-uncorrected-death-check-of-folia.patch} (100%) rename luminol-server/minecraft-patches/features/{0023-Merge-Paper-11945-for-temporary-hopper-behavior-fix.patch => 0032-Paper-Hopper-behavior-fix.patch} (71%) rename luminol-server/minecraft-patches/features/{0053-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch => 0033-Paper-Prevent-zombie-reinforcements-loading-chunks.patch} (78%) rename luminol-server/minecraft-patches/features/{0033-Kaiiju-Don-t-pathfind-outside-region.patch => 0034-Kaiiju-Don-t-pathfind-outside-region.patch} (74%) rename luminol-server/minecraft-patches/features/{0034-Kaiiju-Vanilla-end-portal-teleportation.patch => 0036-Kaiiju-Vanilla-end-portal-teleportation.patch} (93%) rename luminol-server/minecraft-patches/features/{0039-Petal-Reduce-sensor-work.patch => 0037-Petal-Reduce-sensor-work.patch} (78%) rename luminol-server/minecraft-patches/features/{0037-Purpur-Lobotomize-stuck-villagers.patch => 0039-Purpur-Lobotomize-stuck-villagers.patch} (91%) rename luminol-server/minecraft-patches/features/{0036-Purpur-Use-alternative-keep-alive.patch => 0040-Purpur-Use-alternative-keep-alive.patch} (91%) rename luminol-server/minecraft-patches/features/{0040-Pufferfish-Cache-climbing-check-for-activation.patch => 0041-Pufferfish-Cache-climbing-check-for-activation.patch} (83%) delete mode 100644 luminol-server/minecraft-patches/features/0042-Gale-Use-platform-math-functions.patch rename luminol-server/minecraft-patches/features/{0041-Pufferfish-Reduce-chunk-loading-lookups.patch => 0042-Pufferfish-Reduce-chunk-loading-lookups.patch} (79%) rename luminol-server/minecraft-patches/features/{0047-Gale-Faster-chunk-serialization.patch => 0043-Gale-Faster-chunk-serialization.patch} (96%) rename luminol-server/minecraft-patches/features/{0046-Gale-Optimize-noise-generation.patch => 0044-Gale-Optimize-noise-generation.patch} (96%) rename luminol-server/minecraft-patches/features/{0044-Gale-Skip-entity-move-if-movement-is-zero.patch => 0046-Gale-Skip-entity-move-if-movement-is-zero.patch} (80%) create mode 100644 luminol-server/minecraft-patches/features/0047-Gale-Use-platform-math-functions.patch rename luminol-server/minecraft-patches/features/{0043-Gale-Variable-entity-wake-up-duration.patch => 0048-Gale-Variable-entity-wake-up-duration.patch} (91%) rename luminol-server/minecraft-patches/features/{0048-SparklyPaper-Optimize-canSee-checks.patch => 0049-SparklyPaper-Optimize-canSee-checks.patch} (80%) rename luminol-server/minecraft-patches/features/{0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0050-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (81%) rename luminol-server/minecraft-patches/features/{0052-Leaf-Replace-brain-maps-with-optimized-collection.patch => 0051-Leaf-Replace-brain-maps-with-optimized-collection.patch} (87%) rename luminol-server/minecraft-patches/features/{0051-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch => 0052-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch} (78%) rename luminol-server/minecraft-patches/features/{0050-Leaf-Secure-seed-and-matter-seed-command.patch => 0053-Leaf-Secure-seed-and-matter-seed-command.patch} (97%) rename luminol-server/minecraft-patches/features/{0060-Add-config-to-enable-Cross-Region-Damage-trace.patch => 0059-Add-config-to-enable-Cross-Region-Damage-trace.patch} (100%) rename luminol-server/minecraft-patches/features/{0059-Add-config-to-enable-Raytracing-tracker.patch => 0060-Add-config-to-enable-Raytracing-tracker.patch} (99%) diff --git a/luminol-server/minecraft-patches/features/0009-Add-config-for-command-block-command-execution.patch b/luminol-server/minecraft-patches/features/0001-Add-config-for-command-block-command-execution.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0009-Add-config-for-command-block-command-execution.patch rename to luminol-server/minecraft-patches/features/0001-Add-config-for-command-block-command-execution.patch diff --git a/luminol-server/minecraft-patches/features/0011-Add-config-for-entity-to-clean-memory-value-which-is.patch b/luminol-server/minecraft-patches/features/0002-Add-config-for-entity-to-clean-memory-value-which-is.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0011-Add-config-for-entity-to-clean-memory-value-which-is.patch rename to luminol-server/minecraft-patches/features/0002-Add-config-for-entity-to-clean-memory-value-which-is.patch diff --git a/luminol-server/minecraft-patches/features/0005-Add-config-for-offline-mode-warning.patch b/luminol-server/minecraft-patches/features/0003-Add-config-for-offline-mode-warning.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0005-Add-config-for-offline-mode-warning.patch rename to luminol-server/minecraft-patches/features/0003-Add-config-for-offline-mode-warning.patch diff --git a/luminol-server/minecraft-patches/features/0006-Add-config-for-out-of-order-chat-checks.patch b/luminol-server/minecraft-patches/features/0004-Add-config-for-out-of-order-chat-checks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0006-Add-config-for-out-of-order-chat-checks.patch rename to luminol-server/minecraft-patches/features/0004-Add-config-for-out-of-order-chat-checks.patch diff --git a/luminol-server/minecraft-patches/features/0001-Add-config-for-server-mod-name.patch b/luminol-server/minecraft-patches/features/0005-Add-config-for-server-mod-name.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0001-Add-config-for-server-mod-name.patch rename to luminol-server/minecraft-patches/features/0005-Add-config-for-server-mod-name.patch diff --git a/luminol-server/minecraft-patches/features/0002-Add-config-for-unsafe-teleportation.patch b/luminol-server/minecraft-patches/features/0006-Add-config-for-unsafe-teleportation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0002-Add-config-for-unsafe-teleportation.patch rename to luminol-server/minecraft-patches/features/0006-Add-config-for-unsafe-teleportation.patch diff --git a/luminol-server/minecraft-patches/features/0004-Add-config-for-username-check.patch b/luminol-server/minecraft-patches/features/0007-Add-config-for-username-check.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0004-Add-config-for-username-check.patch rename to luminol-server/minecraft-patches/features/0007-Add-config-for-username-check.patch diff --git a/luminol-server/minecraft-patches/features/0003-Add-config-for-vanilla-random.patch b/luminol-server/minecraft-patches/features/0008-Add-config-for-vanilla-random.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0003-Add-config-for-vanilla-random.patch rename to luminol-server/minecraft-patches/features/0008-Add-config-for-vanilla-random.patch diff --git a/luminol-server/minecraft-patches/features/0010-Add-config-for-watchdog-timeout.patch b/luminol-server/minecraft-patches/features/0009-Add-config-for-watchdog-timeout.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0010-Add-config-for-watchdog-timeout.patch rename to luminol-server/minecraft-patches/features/0009-Add-config-for-watchdog-timeout.patch diff --git a/luminol-server/minecraft-patches/features/0008-Add-config-to-disable-entity-tick-catchers.patch b/luminol-server/minecraft-patches/features/0010-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0008-Add-config-to-disable-entity-tick-catchers.patch rename to luminol-server/minecraft-patches/features/0010-Add-config-to-disable-entity-tick-catchers.patch diff --git a/luminol-server/minecraft-patches/features/0013-Add-config-to-disable-heightmap-warning.patch b/luminol-server/minecraft-patches/features/0011-Add-config-to-disable-heightmap-warning.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0013-Add-config-to-disable-heightmap-warning.patch rename to luminol-server/minecraft-patches/features/0011-Add-config-to-disable-heightmap-warning.patch diff --git a/luminol-server/minecraft-patches/features/0015-Add-config-to-enable-tick-command.patch b/luminol-server/minecraft-patches/features/0012-Add-config-to-enable-tick-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0015-Add-config-to-enable-tick-command.patch rename to luminol-server/minecraft-patches/features/0012-Add-config-to-enable-tick-command.patch diff --git a/luminol-server/minecraft-patches/features/0012-Add-config-to-modify-tripwire-behavior.patch b/luminol-server/minecraft-patches/features/0013-Add-config-to-modify-tripwire-behavior.patch similarity index 94% rename from luminol-server/minecraft-patches/features/0012-Add-config-to-modify-tripwire-behavior.patch rename to luminol-server/minecraft-patches/features/0013-Add-config-to-modify-tripwire-behavior.patch index cd6d2ec..e9d2095 100644 --- a/luminol-server/minecraft-patches/features/0012-Add-config-to-modify-tripwire-behavior.patch +++ b/luminol-server/minecraft-patches/features/0013-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..bfcca7f446d1667a857f565bae8bf1cfb1e39e2e 100644 +index f96fc1391167dea48cac1caa464b9026657df89a..ba2da205b046d7d3aab8fb21e116f9be73b13eb3 100644 --- a/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java +++ b/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java -@@ -27,15 +27,41 @@ public class EndPlatformFeature extends Feature { +@@ -27,6 +27,11 @@ public class EndPlatformFeature extends Feature { // CraftBukkit end BlockPos.MutableBlockPos mutableBlockPos = pos.mutable(); @@ -46,9 +46,8 @@ index f96fc1391167dea48cac1caa464b9026657df89a..bfcca7f446d1667a857f565bae8bf1cf for (int i = -2; i <= 2; i++) { for (int i1 = -2; i1 <= 2; i1++) { for (int i2 = -1; i2 < 3; i2++) { - BlockPos blockPos = mutableBlockPos.set(pos).move(i1, i2, i); - Block block = i2 == -1 ? Blocks.OBSIDIAN : Blocks.AIR; -- // CraftBukkit start +@@ -35,7 +40,29 @@ public class EndPlatformFeature extends Feature { + // CraftBukkit start if (!blockList.getBlockState(blockPos).is(block)) { if (dropBlocks) { - blockList.destroyBlock(blockPos, true, null); @@ -78,7 +77,7 @@ index f96fc1391167dea48cac1caa464b9026657df89a..bfcca7f446d1667a857f565bae8bf1cf } blockList.setBlock(blockPos, block.defaultBlockState(), 3); -@@ -54,11 +80,39 @@ public class EndPlatformFeature extends Feature { +@@ -54,11 +81,39 @@ public class EndPlatformFeature extends Feature { if (portalEvent.isCancelled()) return; } diff --git a/luminol-server/minecraft-patches/features/0007-Add-config-to-verify-signature-only-in-online-mode.patch b/luminol-server/minecraft-patches/features/0015-Add-config-to-verify-signature-only-in-online-mode.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0007-Add-config-to-verify-signature-only-in-online-mode.patch rename to luminol-server/minecraft-patches/features/0015-Add-config-to-verify-signature-only-in-online-mode.patch diff --git a/luminol-server/minecraft-patches/features/0025-Correct-player-respawn-place.patch b/luminol-server/minecraft-patches/features/0023-Correct-player-respawn-place.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0025-Correct-player-respawn-place.patch rename to luminol-server/minecraft-patches/features/0023-Correct-player-respawn-place.patch diff --git a/luminol-server/minecraft-patches/features/0026-Command-IllegalArgumentException-crash-fix.patch b/luminol-server/minecraft-patches/features/0024-Command-IllegalArgumentException-crash-fix.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0026-Command-IllegalArgumentException-crash-fix.patch rename to luminol-server/minecraft-patches/features/0024-Command-IllegalArgumentException-crash-fix.patch diff --git a/luminol-server/minecraft-patches/features/0024-Do-not-search-the-block-out-of-current-region.patch b/luminol-server/minecraft-patches/features/0025-Do-not-search-the-block-out-of-current-region.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0024-Do-not-search-the-block-out-of-current-region.patch rename to luminol-server/minecraft-patches/features/0025-Do-not-search-the-block-out-of-current-region.patch diff --git a/luminol-server/minecraft-patches/features/0027-Force-disable-builtin-spark-plugin.patch b/luminol-server/minecraft-patches/features/0026-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0027-Force-disable-builtin-spark-plugin.patch rename to luminol-server/minecraft-patches/features/0026-Force-disable-builtin-spark-plugin.patch diff --git a/luminol-server/minecraft-patches/features/0028-Fix-creative-item-picking.patch b/luminol-server/minecraft-patches/features/0027-Fix-creative-player-item-pick.patch similarity index 83% rename from luminol-server/minecraft-patches/features/0028-Fix-creative-item-picking.patch rename to luminol-server/minecraft-patches/features/0027-Fix-creative-player-item-pick.patch index d5d56fb..a6fa773 100644 --- a/luminol-server/minecraft-patches/features/0028-Fix-creative-item-picking.patch +++ b/luminol-server/minecraft-patches/features/0027-Fix-creative-player-item-pick.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Sat, 10 May 2025 19:46:16 +0800 -Subject: [PATCH] Fix creative item picking +Subject: [PATCH] Fix creative player item pick diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java -index 7587130e021d494ae5013f7992b8f3c96590cbd7..f6d537ce0549b3359462f238c39952fe855dfbc1 100644 +index 7587130e021d494ae5013f7992b8f3c96590cbd7..1116e2f00ea54f738535d7243fec6ad49b96f6ee 100644 --- a/net/minecraft/world/entity/item/ItemEntity.java +++ b/net/minecraft/world/entity/item/ItemEntity.java @@ -435,7 +435,15 @@ public class ItemEntity extends Entity implements TraceableEntity { @@ -13,8 +13,8 @@ index 7587130e021d494ae5013f7992b8f3c96590cbd7..f6d537ce0549b3359462f238c39952fe int count = item.getCount(); // CraftBukkit start - fire PlayerPickupItemEvent - int canHold = entity.getInventory().canHold(item); -+ int canHold;// = entity.getInventory().canHold(item); // Luminol - Fix creative item picking + // Luminol start - Fix creative item picking ++ int canHold; + if (entity instanceof net.minecraft.server.level.ServerPlayer + && ((net.minecraft.server.level.ServerPlayer) entity).gameMode.getGameModeForPlayer().equals(net.minecraft.world.level.GameType.CREATIVE)) { + canHold = count; diff --git a/luminol-server/minecraft-patches/features/0030-Fix-a-series-issue-around-entity-memory-typed-Global.patch b/luminol-server/minecraft-patches/features/0028-Fix-a-series-issue-around-entity-memory-typed-Global.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0030-Fix-a-series-issue-around-entity-memory-typed-Global.patch rename to luminol-server/minecraft-patches/features/0028-Fix-a-series-issue-around-entity-memory-typed-Global.patch diff --git a/luminol-server/minecraft-patches/features/0031-Fix-incorrectly-synced-data-after-player-teleportati.patch b/luminol-server/minecraft-patches/features/0029-Fix-incorrectly-synced-data-after-player-teleportati.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0031-Fix-incorrectly-synced-data-after-player-teleportati.patch rename to luminol-server/minecraft-patches/features/0029-Fix-incorrectly-synced-data-after-player-teleportati.patch diff --git a/luminol-server/minecraft-patches/features/0032-Fix-off-tickregion-sync-teleport.patch b/luminol-server/minecraft-patches/features/0030-Fix-off-tickregion-sync-teleport.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0032-Fix-off-tickregion-sync-teleport.patch rename to luminol-server/minecraft-patches/features/0030-Fix-off-tickregion-sync-teleport.patch diff --git a/luminol-server/minecraft-patches/features/0029-Fix-uncorrected-death-check-of-folia.patch b/luminol-server/minecraft-patches/features/0031-Fix-uncorrected-death-check-of-folia.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0029-Fix-uncorrected-death-check-of-folia.patch rename to luminol-server/minecraft-patches/features/0031-Fix-uncorrected-death-check-of-folia.patch diff --git a/luminol-server/minecraft-patches/features/0023-Merge-Paper-11945-for-temporary-hopper-behavior-fix.patch b/luminol-server/minecraft-patches/features/0032-Paper-Hopper-behavior-fix.patch similarity index 71% rename from luminol-server/minecraft-patches/features/0023-Merge-Paper-11945-for-temporary-hopper-behavior-fix.patch rename to luminol-server/minecraft-patches/features/0032-Paper-Hopper-behavior-fix.patch index a317fbf..e1675d8 100644 --- a/luminol-server/minecraft-patches/features/0023-Merge-Paper-11945-for-temporary-hopper-behavior-fix.patch +++ b/luminol-server/minecraft-patches/features/0032-Paper-Hopper-behavior-fix.patch @@ -1,9 +1,13 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 11:03:09 +0800 -Subject: [PATCH] Merge Paper #11945 for temporary hopper behavior fix +Subject: [PATCH] Paper: Hopper behavior fix -A hopper optimization fix on Paper's pr : https://github.com/PaperMC/Paper/pull/11945 +temporary fix +Origin: https://github.com/PaperMC/Paper/pull/11945 +Co-authored by: Aikar +As part of: Paper (https://github.com/PaperMC/Paper/blob/d2d23118c151f11c00e42b5c60ab7e4a3a1be09c/paper-server/patches/features/0029-Optimize-Hoppers.patch) +Licensed under: MIT (https://github.com/PaperMC/Paper/blob/fa360aa83657d15e8e803ce55800986f6bff8f70/licenses/MIT.md) diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java index ae988c4910421fb720177178ef6136e595ae6946..72a81e29be6570fb119b159210453a86f003f893 100644 diff --git a/luminol-server/minecraft-patches/features/0053-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch b/luminol-server/minecraft-patches/features/0033-Paper-Prevent-zombie-reinforcements-loading-chunks.patch similarity index 78% rename from luminol-server/minecraft-patches/features/0053-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch rename to luminol-server/minecraft-patches/features/0033-Paper-Prevent-zombie-reinforcements-loading-chunks.patch index b1425ef..ca9a0c3 100644 --- a/luminol-server/minecraft-patches/features/0053-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch +++ b/luminol-server/minecraft-patches/features/0033-Paper-Prevent-zombie-reinforcements-loading-chunks.patch @@ -1,11 +1,12 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sat, 8 Mar 2025 21:21:11 +0800 -Subject: [PATCH] Leaf Paper PR: Prevent zombie reinforcements loading chunks +Subject: [PATCH] Paper: Prevent zombie reinforcements loading chunks +Origin: https://github.com/PaperMC/Paper/pull/11945 Co-authored by: Newwind -As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/ver/1.21.4/leaf-server/minecraft-patches/features/0081-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch) -Original license: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) +As part of: Paper (https://github.com/PaperMC/Paper/blob/2ae1f05336d0f13b646e6c284f83ded16aae84ff/patches/server/1045-Prevent-zombie-reinforcements-loading-chunks.patch) +Licensed under: GPL-3.0 (https://github.com/PaperMC/Paper/blob/fa360aa83657d15e8e803ce55800986f6bff8f70/licenses/GPL.md) diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java index cf231380febd6d316eb902d43c636135ee0d7fa4..731473610e068a613d67efaee08ded810fe86cf0 100644 diff --git a/luminol-server/minecraft-patches/features/0033-Kaiiju-Don-t-pathfind-outside-region.patch b/luminol-server/minecraft-patches/features/0034-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 74% rename from luminol-server/minecraft-patches/features/0033-Kaiiju-Don-t-pathfind-outside-region.patch rename to luminol-server/minecraft-patches/features/0034-Kaiiju-Don-t-pathfind-outside-region.patch index fd72f61..29b5922 100644 --- a/luminol-server/minecraft-patches/features/0033-Kaiiju-Don-t-pathfind-outside-region.patch +++ b/luminol-server/minecraft-patches/features/0034-Kaiiju-Don-t-pathfind-outside-region.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 11:03:59 +0800 -Subject: [PATCH] Kaiiju Don't pathfind outside region +Subject: [PATCH] Kaiiju: Don't pathfind outside region +Co-authored by: Sofiane H. Djerbi <46628754+kugge@users.noreply.github.com> +As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/patches/server/0028-Don-t-pathfind-outside-region.patch) +Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE) diff --git a/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java b/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java index 621ba76784f2b92790eca62be4d0688834335ab6..52b3f1795843f40fdb3298cfd1a570a211a08739 100644 diff --git a/luminol-server/minecraft-patches/features/0035-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/minecraft-patches/features/0035-Kaiiju-Entity-tick-and-removal-limiter.patch index 59f9a99..49dbeb0 100644 --- a/luminol-server/minecraft-patches/features/0035-Kaiiju-Entity-tick-and-removal-limiter.patch +++ b/luminol-server/minecraft-patches/features/0035-Kaiiju-Entity-tick-and-removal-limiter.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 11:07:08 +0800 -Subject: [PATCH] Kaiiju Entity tick and removal limiter +Subject: [PATCH] Kaiiju: Entity tick and removal limiter +Co-authored by: Xymb +As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/patches/server/0021-Entity-ticking-throttling-removal-to-prevent-lag.patch) +Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE) diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java index c6e487a4c14e6b82533881d01f32349b9ae28728..2c747cb8a724cd25c9d724908f92b320741600de 100644 diff --git a/luminol-server/minecraft-patches/features/0034-Kaiiju-Vanilla-end-portal-teleportation.patch b/luminol-server/minecraft-patches/features/0036-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 93% rename from luminol-server/minecraft-patches/features/0034-Kaiiju-Vanilla-end-portal-teleportation.patch rename to luminol-server/minecraft-patches/features/0036-Kaiiju-Vanilla-end-portal-teleportation.patch index 23e9f1e..1df1874 100644 --- a/luminol-server/minecraft-patches/features/0034-Kaiiju-Vanilla-end-portal-teleportation.patch +++ b/luminol-server/minecraft-patches/features/0036-Kaiiju-Vanilla-end-portal-teleportation.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 11:04:12 +0800 -Subject: [PATCH] Kaiiju Vanilla end portal teleportation +Subject: [PATCH] Kaiiju: Vanilla end portal teleportation +Co-authored by: Sofiane H. Djerbi <46628754+kugge@users.noreply.github.com> +As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/patches/server/0024-Vanilla-end-portal-teleportation.patch) +Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java index 771744d4540fcd163efcde43c27111680b25c928..2efc715857d49f69a8289bcf50f422960c00c8bd 100644 diff --git a/luminol-server/minecraft-patches/features/0039-Petal-Reduce-sensor-work.patch b/luminol-server/minecraft-patches/features/0037-Petal-Reduce-sensor-work.patch similarity index 78% rename from luminol-server/minecraft-patches/features/0039-Petal-Reduce-sensor-work.patch rename to luminol-server/minecraft-patches/features/0037-Petal-Reduce-sensor-work.patch index 02e2289..87eea8c 100644 --- a/luminol-server/minecraft-patches/features/0039-Petal-Reduce-sensor-work.patch +++ b/luminol-server/minecraft-patches/features/0037-Petal-Reduce-sensor-work.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 12:21:59 +0800 -Subject: [PATCH] Petal Reduce sensor work +Subject: [PATCH] Petal: Reduce sensor work +Co-authored by: peaches94 +As part of: Petal (https://github.com/Bloom-host/Petal/blob/cc691540fb48240f38b376f3d94c8b0db2b60d99/patches/server/0005-feat-reduce-sensor-work.patch) +Licensed under: GPL-3.0 (https://github.com/Bloom-host/Petal/blob/cc691540fb48240f38b376f3d94c8b0db2b60d99/LICENSE) diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java index 94a7b95f41c2954561f9c3cb0f61210c0c058f1d..dbe0fc0c46f66c61a2f286d521302719b28917c1 100644 diff --git a/luminol-server/minecraft-patches/features/0038-Purpur-Barrels-and-enderchests-6-rows.patch b/luminol-server/minecraft-patches/features/0038-Purpur-Barrels-and-enderchests-6-rows.patch index 0f52248..64ff4be 100644 --- a/luminol-server/minecraft-patches/features/0038-Purpur-Barrels-and-enderchests-6-rows.patch +++ b/luminol-server/minecraft-patches/features/0038-Purpur-Barrels-and-enderchests-6-rows.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi 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 +Co-authored by: William Blake Galbreath +As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch) +Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/LICENSE) diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java index 751b011701d6ae373099226ea63ffbafcd24ce6a..e5e946462da9e56344428139768075b7bd228ec0 100644 diff --git a/luminol-server/minecraft-patches/features/0037-Purpur-Lobotomize-stuck-villagers.patch b/luminol-server/minecraft-patches/features/0039-Purpur-Lobotomize-stuck-villagers.patch similarity index 91% rename from luminol-server/minecraft-patches/features/0037-Purpur-Lobotomize-stuck-villagers.patch rename to luminol-server/minecraft-patches/features/0039-Purpur-Lobotomize-stuck-villagers.patch index 47816e2..baa597f 100644 --- a/luminol-server/minecraft-patches/features/0037-Purpur-Lobotomize-stuck-villagers.patch +++ b/luminol-server/minecraft-patches/features/0039-Purpur-Lobotomize-stuck-villagers.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Thu, 30 Jan 2025 08:42:29 +0800 -Subject: [PATCH] Purpur Lobotomize stuck villagers +Subject: [PATCH] Purpur: Lobotomize stuck villagers +Co-authored by: William Blake Galbreath +As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/purpur-server/minecraft-patches/features/0001-Ridables.patch) +Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/LICENSE) diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java index 7ea74aeb905b95e5919d74df5fbc5e8f7a9985e3..b61da3d0d7d24b674cae155b95f7fab0669f4a20 100644 diff --git a/luminol-server/minecraft-patches/features/0036-Purpur-Use-alternative-keep-alive.patch b/luminol-server/minecraft-patches/features/0040-Purpur-Use-alternative-keep-alive.patch similarity index 91% rename from luminol-server/minecraft-patches/features/0036-Purpur-Use-alternative-keep-alive.patch rename to luminol-server/minecraft-patches/features/0040-Purpur-Use-alternative-keep-alive.patch index c5b2e3e..2b364b5 100644 --- a/luminol-server/minecraft-patches/features/0036-Purpur-Use-alternative-keep-alive.patch +++ b/luminol-server/minecraft-patches/features/0040-Purpur-Use-alternative-keep-alive.patch @@ -1,8 +1,10 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 11:43:15 +0800 -Subject: [PATCH] Purpur Use alternative keep alive +Subject: [PATCH] Purpur: Use alternative keep alive +As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch) +Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/LICENSE) diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java index 79fe336adf35f4f007461ed050e6301764fe7fc3..a5b805b98cf138eabfb06f4ff202462be60c2995 100644 diff --git a/luminol-server/minecraft-patches/features/0040-Pufferfish-Cache-climbing-check-for-activation.patch b/luminol-server/minecraft-patches/features/0041-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 83% rename from luminol-server/minecraft-patches/features/0040-Pufferfish-Cache-climbing-check-for-activation.patch rename to luminol-server/minecraft-patches/features/0041-Pufferfish-Cache-climbing-check-for-activation.patch index 3097d7a..f587325 100644 --- a/luminol-server/minecraft-patches/features/0040-Pufferfish-Cache-climbing-check-for-activation.patch +++ b/luminol-server/minecraft-patches/features/0041-Pufferfish-Cache-climbing-check-for-activation.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 12:25:44 +0800 -Subject: [PATCH] Pufferfish Cache climbing check for activation +Subject: [PATCH] Pufferfish: Cache climbing check for activation +Co-authored by: Paul Sauve +As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/patches/server/0017-Cache-climbing-check-for-activation.patch) +Licensed under: GPL-3.0 (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/PATCH-LICENSE) diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java index c260741a87513b89a5cc62c543fb9f990f86491e..beb9b3b3cd5ca60bd2cdada937bff8a1da639da5 100644 diff --git a/luminol-server/minecraft-patches/features/0042-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0042-Gale-Use-platform-math-functions.patch deleted file mode 100644 index d4f858c..0000000 --- a/luminol-server/minecraft-patches/features/0042-Gale-Use-platform-math-functions.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Sun, 12 Jan 2025 14:15:24 +0800 -Subject: [PATCH] Gale Use platform math functions - -License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) -Gale - https://galemc.org - -This patch is based on the following patch: -"Use Math.floor instead of fastfloor" -By: Xymb -As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju) -Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) - -* Comparison of floor methods used in Paper * - -Measure shown is floored number of milliseconds -(nanoseconds integer-divided by 1_000_000 -taken to get the floor of 1000 randomly chosen doubles -(all in the range of [-Integer.MAX_VALUE + 10, Integer.MAX_VALUE - 10]) -100_000 times (making it 100_000_000 floor operations total) -and adding it to a total. - -We are testing the following methods: -* net.minecraft.util.Mth.floor -* java.lang.Math.floor -* java.lang.StrictMath.floor -* org.apache.commons.math3.util.FastMath.floor -* org.apache.commons.math3.util.FastMath.floor, but with a hot start (see comment in code) -* io.papermc.paper.util.MCUtil.fastFloor - -The tests performed clearly show that Math.floor is the fastest. -This is most likely due to java.lang.Math's usage of the @IntrinsicCandidate -annotation, which allows the JVM to use a more optimized implementation at runtime. -However, in the case that there is no intrinsic replacement for Math.floor, -it defers to StrictMath.floor, which relies on a number of native methods, and is -still much faster than the existing Minecraft utility functions. -Therefore, using Math.floor instead of these functions is better regardless. -In Apache Commons Math 4, FastMath.floor has also been removed in favor of Math.floor. - -The versions used: -* Windows 10 Home 21H2 19044.3086 -* OpenJDK Runtime Environment Temurin-19.0.2+7 (build 19.0.2+7) -* Paper a3c760e6af1e8c7244ef75c6da6e6df278a79e14 on Minecraft 1.20.1 -* Apache Commons Math 3.6.1 - -Results: -Total is of type int Total is of type double ----------------------------------------------------------------------------------- -Mth.floor 2113 (double) Mth.floor 2658 -(int) Math.floor 130 Math.floor 194 -(int) StrictMath.floor 835 StrictMath.floor 381 -(int) FastMath.floor 412 FastMath.floor 376 -(int) FastMath.floor with hot start 359 FastMath.floor with hot start 321 -MCUtil.fastFloor 2284 (double) MCUtil.fastFloor 2469 - -Code is below: -```java -package somepackage; - -import io.papermc.paper.util.MCUtil; -import net.minecraft.util.Mth; - -import java.util.Random; - -public class Main { - - public static void main(String[] args) { - - // IF FastMath.floor with a hot start: - // FastMath.floor(37485.5); - - var random = new Random(4889338); - int size = 1000; - var values = new double[size]; - double bound = Integer.MAX_VALUE - 10; - for (int i = 0; i < size; i++) { - values[i] = random.nextDouble(bound * 2) - bound; - } - int repeats = 100_000; - - // int total = 0; - // OR - // double total = 0; - - long start = System.nanoTime(); - for (int repeat = 0; repeat < repeats; repeat++) { - for (int index = 0; index < size; index++) { - total += insert_function_being_tested_here(values[index]); - } - } - long diff = System.nanoTime() - start; - System.out.println(total); - System.out.println(diff / 1_000_000L); - - } - -} -``` - -diff --git a/net/minecraft/util/Mth.java b/net/minecraft/util/Mth.java -index d5d8134da9423cec199cf44762460104677194d6..e0eed27cb33348fcb46858c40014b5fe5dbaf426 100644 ---- a/net/minecraft/util/Mth.java -+++ b/net/minecraft/util/Mth.java -@@ -58,18 +58,15 @@ public class Mth { - } - - public static int floor(float value) { -- int i = (int)value; -- return value < i ? i - 1 : i; -+ return (int) Math.floor(value); // Gale - use platform math functions - } - - public static int floor(double value) { -- int i = (int)value; -- return value < i ? i - 1 : i; -+ return (int) Math.floor(value); // Gale - use platform math functions - } - - public static long lfloor(double value) { -- long l = (long)value; -- return value < l ? l - 1L : l; -+ return (long) Math.floor(value); // Gale - use platform math functions - } - - public static float abs(float value) { -@@ -81,13 +78,11 @@ public class Mth { - } - - public static int ceil(float value) { -- int i = (int)value; -- return value > i ? i + 1 : i; -+ return (int) Math.ceil(value); // Gale - use platform math functions - } - - public static int ceil(double value) { -- int i = (int)value; -- return value > i ? i + 1 : i; -+ return (int) Math.ceil(value); // Gale - use platform math functions - } - - public static int clamp(int value, int min, int max) { -@@ -123,15 +118,7 @@ public class Mth { - } - - public static double absMax(double x, double y) { -- if (x < 0.0) { -- x = -x; -- } -- -- if (y < 0.0) { -- y = -y; -- } -- -- return Math.max(x, y); -+ return Math.max(Math.abs(x), Math.abs(y)); // Gale - use platform math functions - } - - public static int floorDiv(int dividend, int divisor) { diff --git a/luminol-server/minecraft-patches/features/0041-Pufferfish-Reduce-chunk-loading-lookups.patch b/luminol-server/minecraft-patches/features/0042-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 79% rename from luminol-server/minecraft-patches/features/0041-Pufferfish-Reduce-chunk-loading-lookups.patch rename to luminol-server/minecraft-patches/features/0042-Pufferfish-Reduce-chunk-loading-lookups.patch index b5d9ccf..ccb5ef3 100644 --- a/luminol-server/minecraft-patches/features/0041-Pufferfish-Reduce-chunk-loading-lookups.patch +++ b/luminol-server/minecraft-patches/features/0042-Pufferfish-Reduce-chunk-loading-lookups.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 12:27:17 +0800 -Subject: [PATCH] Pufferfish Reduce chunk loading & lookups +Subject: [PATCH] Pufferfish: Reduce chunk loading & lookups +Co-authored by: Paul Sauve +As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/patches/server/0014-Reduce-chunk-loading-lookups.patch) +Licensed under: GPL-3.0 (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/PATCH-LICENSE) diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java index 4b5ffd278e0e9d47100e5452949e8d757bbfece4..772ccc4dc66253a84a6d24d00e271d9b4916f052 100644 diff --git a/luminol-server/minecraft-patches/features/0047-Gale-Faster-chunk-serialization.patch b/luminol-server/minecraft-patches/features/0043-Gale-Faster-chunk-serialization.patch similarity index 96% rename from luminol-server/minecraft-patches/features/0047-Gale-Faster-chunk-serialization.patch rename to luminol-server/minecraft-patches/features/0043-Gale-Faster-chunk-serialization.patch index 6cf5e4a..9ee8351 100644 --- a/luminol-server/minecraft-patches/features/0047-Gale-Faster-chunk-serialization.patch +++ b/luminol-server/minecraft-patches/features/0043-Gale-Faster-chunk-serialization.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bacteriawa Date: Wed, 30 Nov 2022 21:51:16 +0100 -Subject: [PATCH] Gale Faster chunk serialization +Subject: [PATCH] Gale: Faster chunk serialization +Co-authored by: Martijn Muijsers , Angeline +As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0096-Faster-chunk-serialization.patch), Lithium (https://github.com/CaffeineMC/lithium-fabric) +Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/util/BitStorage.java b/net/minecraft/util/BitStorage.java index 02502d50f0255f5bbcc0ecb965abb48cc1a112da..322a1ba06d6aed44ec67dc3f1831ac6b05c82fe0 100644 diff --git a/luminol-server/minecraft-patches/features/0046-Gale-Optimize-noise-generation.patch b/luminol-server/minecraft-patches/features/0044-Gale-Optimize-noise-generation.patch similarity index 96% rename from luminol-server/minecraft-patches/features/0046-Gale-Optimize-noise-generation.patch rename to luminol-server/minecraft-patches/features/0044-Gale-Optimize-noise-generation.patch index a637098..562c4de 100644 --- a/luminol-server/minecraft-patches/features/0046-Gale-Optimize-noise-generation.patch +++ b/luminol-server/minecraft-patches/features/0044-Gale-Optimize-noise-generation.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Wed, 22 Jan 2025 17:23:16 +0800 -Subject: [PATCH] Gale Optimize noise generation +Subject: [PATCH] Gale: Optimize noise generation +Co-authored by: Martijn Muijsers , ishland +As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0106-Optimize-noise-generation.patch) and C2ME (https://github.com/RelativityMC/C2ME-fabric) +Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java b/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java index fb11a2eea540d55e50eab59f9857ca5d99f556f8..dcc1a3f8b611c9f103b848db90b077b984b60ada 100644 diff --git a/luminol-server/minecraft-patches/features/0045-Gale-Replace-AI-attributes-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0045-Gale-Replace-AI-attributes-with-optimized-collection.patch index a84d7cc..607145f 100644 --- a/luminol-server/minecraft-patches/features/0045-Gale-Replace-AI-attributes-with-optimized-collection.patch +++ b/luminol-server/minecraft-patches/features/0045-Gale-Replace-AI-attributes-with-optimized-collection.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Wed, 22 Jan 2025 17:18:00 +0800 -Subject: [PATCH] Gale Replace AI attributes with optimized collections +Subject: [PATCH] Gale: Replace AI attributes with optimized collections +Co-authored by: Martijn Muijsers , 2No2Name <2No2Name@web.de> +As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0087-Replace-AI-attributes-with-optimized-collections.patch) and Lithium (https://github.com/CaffeineMC/lithium-fabric) +Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/net/minecraft/world/entity/ai/attributes/AttributeMap.java index 4c808c7ef336de74048f40bd1cc8b14131a9325d..8dfd32a8ec590c688dc8d64f18b6b59378c17880 100644 diff --git a/luminol-server/minecraft-patches/features/0044-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0046-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 80% rename from luminol-server/minecraft-patches/features/0044-Gale-Skip-entity-move-if-movement-is-zero.patch rename to luminol-server/minecraft-patches/features/0046-Gale-Skip-entity-move-if-movement-is-zero.patch index 4c1724f..34d0936 100644 --- a/luminol-server/minecraft-patches/features/0044-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/luminol-server/minecraft-patches/features/0046-Gale-Skip-entity-move-if-movement-is-zero.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 15:35:15 +0800 -Subject: [PATCH] Gale Skip entity move if movement is zero +Subject: [PATCH] Gale: Skip entity move if movement is zero +Co-authored by: Martijn Muijsers , ishland +As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0103-Skip-entity-move-if-movement-is-zero.patch) and VMP (https://github.com/RelativityMC/VMP-fabric) +Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java index 2efc715857d49f69a8289bcf50f422960c00c8bd..18e6e9fe39a559ae043fdafcf4e4db467144e309 100644 diff --git a/luminol-server/minecraft-patches/features/0047-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0047-Gale-Use-platform-math-functions.patch new file mode 100644 index 0000000..4d92163 --- /dev/null +++ b/luminol-server/minecraft-patches/features/0047-Gale-Use-platform-math-functions.patch @@ -0,0 +1,68 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Sun, 12 Jan 2025 14:15:24 +0800 +Subject: [PATCH] Gale: Use platform math functions + +Co-authored by: Martijn Muijsers , Xymb +As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0019-Use-platform-math-functions.patch) and Kaiiju(https://github.com/KaiijuMC/Kaiiju) +Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) + +diff --git a/net/minecraft/util/Mth.java b/net/minecraft/util/Mth.java +index d5d8134da9423cec199cf44762460104677194d6..e0eed27cb33348fcb46858c40014b5fe5dbaf426 100644 +--- a/net/minecraft/util/Mth.java ++++ b/net/minecraft/util/Mth.java +@@ -58,18 +58,15 @@ public class Mth { + } + + public static int floor(float value) { +- int i = (int)value; +- return value < i ? i - 1 : i; ++ return (int) Math.floor(value); // Gale - use platform math functions + } + + public static int floor(double value) { +- int i = (int)value; +- return value < i ? i - 1 : i; ++ return (int) Math.floor(value); // Gale - use platform math functions + } + + public static long lfloor(double value) { +- long l = (long)value; +- return value < l ? l - 1L : l; ++ return (long) Math.floor(value); // Gale - use platform math functions + } + + public static float abs(float value) { +@@ -81,13 +78,11 @@ public class Mth { + } + + public static int ceil(float value) { +- int i = (int)value; +- return value > i ? i + 1 : i; ++ return (int) Math.ceil(value); // Gale - use platform math functions + } + + public static int ceil(double value) { +- int i = (int)value; +- return value > i ? i + 1 : i; ++ return (int) Math.ceil(value); // Gale - use platform math functions + } + + public static int clamp(int value, int min, int max) { +@@ -123,15 +118,7 @@ public class Mth { + } + + public static double absMax(double x, double y) { +- if (x < 0.0) { +- x = -x; +- } +- +- if (y < 0.0) { +- y = -y; +- } +- +- return Math.max(x, y); ++ return Math.max(Math.abs(x), Math.abs(y)); // Gale - use platform math functions + } + + public static int floorDiv(int dividend, int divisor) { diff --git a/luminol-server/minecraft-patches/features/0043-Gale-Variable-entity-wake-up-duration.patch b/luminol-server/minecraft-patches/features/0048-Gale-Variable-entity-wake-up-duration.patch similarity index 91% rename from luminol-server/minecraft-patches/features/0043-Gale-Variable-entity-wake-up-duration.patch rename to luminol-server/minecraft-patches/features/0048-Gale-Variable-entity-wake-up-duration.patch index f21f28f..1eccc3b 100644 --- a/luminol-server/minecraft-patches/features/0043-Gale-Variable-entity-wake-up-duration.patch +++ b/luminol-server/minecraft-patches/features/0048-Gale-Variable-entity-wake-up-duration.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 15:31:52 +0800 -Subject: [PATCH] Gale Variable entity wake-up duration +Subject: [PATCH] Gale: Variable entity wake-up duration +Co-authored by: Martijn Muijsers +As part of: Gale (https://github.com/GaleMC/Gale/blob/276e903b2688f23b19bdc8d493c0bf87656d2400/patches/server/0054-Variable-entity-wake-up-duration.patch) +Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java index beb9b3b3cd5ca60bd2cdada937bff8a1da639da5..3c9fc433155dd235668ded700d51d95434ba745f 100644 diff --git a/luminol-server/minecraft-patches/features/0048-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/minecraft-patches/features/0049-SparklyPaper-Optimize-canSee-checks.patch similarity index 80% rename from luminol-server/minecraft-patches/features/0048-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/minecraft-patches/features/0049-SparklyPaper-Optimize-canSee-checks.patch index c7e93ff..fe4d77c 100644 --- a/luminol-server/minecraft-patches/features/0048-SparklyPaper-Optimize-canSee-checks.patch +++ b/luminol-server/minecraft-patches/features/0049-SparklyPaper-Optimize-canSee-checks.patch @@ -1,8 +1,10 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 15:35:43 +0800 -Subject: [PATCH] SparklyPaper Optimize canSee checks +Subject: [PATCH] SparklyPaper: Optimize canSee checks +Co-authored by: MrPowerGamerBR +As part of: SparklyPaper (https://github.com/SparklyPower/SparklyPaper/blob/a69d3690472c9967772ffd4d4bd1f41403b7ea6f/sparklypaper-server/paper-patches/features/0005-Optimize-canSee-checks.patch) diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java index 5c507be097051de9a43a31bbc6190c3db7688667..7eff847790394aecd058e7a61905da86163b4c6e 100644 diff --git a/luminol-server/minecraft-patches/features/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/luminol-server/minecraft-patches/features/0050-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 81% rename from luminol-server/minecraft-patches/features/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to luminol-server/minecraft-patches/features/0050-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch index 5be28c0..43871cd 100644 --- a/luminol-server/minecraft-patches/features/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch +++ b/luminol-server/minecraft-patches/features/0050-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch @@ -1,9 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 15:37:25 +0800 -Subject: [PATCH] SparklyPaper Skip "distanceToSqr" call in +Subject: [PATCH] SparklyPaper: Skip "distanceToSqr" call in "ServerEntity#sendChanges" if the delta movement hasn't changed +Co-authored by: MrPowerGamerBR +As part of: SparklyPaper (https://github.com/SparklyPower/SparklyPaper/blob/a69d3690472c9967772ffd4d4bd1f41403b7ea6f/sparklypaper-server/minecraft-patches/features/0002-Skip-distanceToSqr-call-in-ServerEntity-sendChanges-.patch) diff --git a/net/minecraft/server/level/ServerEntity.java b/net/minecraft/server/level/ServerEntity.java index 0fb253aa55a24b56b17f524b3261c5b75c7d7e59..1de43a4969a2a4535239b15a7bc30d99eb6934c6 100644 diff --git a/luminol-server/minecraft-patches/features/0052-Leaf-Replace-brain-maps-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0051-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 87% rename from luminol-server/minecraft-patches/features/0052-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0051-Leaf-Replace-brain-maps-with-optimized-collection.patch index 9f60d2f..c87416e 100644 --- a/luminol-server/minecraft-patches/features/0052-Leaf-Replace-brain-maps-with-optimized-collection.patch +++ b/luminol-server/minecraft-patches/features/0051-Leaf-Replace-brain-maps-with-optimized-collection.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sat, 8 Mar 2025 21:20:11 +0800 -Subject: [PATCH] Leaf Replace brain maps with optimized collection +Subject: [PATCH] Leaf: Replace brain maps with optimized collection Co-authored by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> -As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/ver/1.21.4/leaf-server/minecraft-patches/features/0070-Replace-brain-maps-with-optimized-collection.patch) -Licensed under: MIT +As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/leaf-server/minecraft-patches/features/0070-Replace-brain-maps-with-optimized-collection.patch) +Licensed under: MIT (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/licenses/MIT.txt) diff --git a/net/minecraft/world/entity/ai/Brain.java b/net/minecraft/world/entity/ai/Brain.java index 52b08be8b37117edc38dddf6d1919178b1f86271..d98eae5ee8a69a89e37751594dfff636831c8016 100644 diff --git a/luminol-server/minecraft-patches/features/0051-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/luminol-server/minecraft-patches/features/0052-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 78% rename from luminol-server/minecraft-patches/features/0051-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to luminol-server/minecraft-patches/features/0052-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch index 3319add..a0929d9 100644 --- a/luminol-server/minecraft-patches/features/0051-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch +++ b/luminol-server/minecraft-patches/features/0052-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch @@ -1,12 +1,12 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sat, 8 Mar 2025 21:14:53 +0800 -Subject: [PATCH] Leaf Remove useless creating stats json bases on player name +Subject: [PATCH] Leaf: Remove useless creating stats json bases on player name logic Co-authored by: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> -As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/ver/1.21.4/leaf-server/minecraft-patches/features/0043-Remove-useless-creating-stats-json-bases-on-player-n.patch) -Licensed under: MIT +As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/leaf-server/minecraft-patches/features/0043-Remove-useless-creating-stats-json-bases-on-player-n.patch) +Licensed under: MIT (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/licenses/MIT.txt) diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java index e5e946462da9e56344428139768075b7bd228ec0..9777a5b7ba9916e426ba87d6ee7cd56f0e43c195 100644 diff --git a/luminol-server/minecraft-patches/features/0050-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/minecraft-patches/features/0053-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 97% rename from luminol-server/minecraft-patches/features/0050-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/minecraft-patches/features/0053-Leaf-Secure-seed-and-matter-seed-command.patch index f33b039..16fbe85 100644 --- a/luminol-server/minecraft-patches/features/0050-Leaf-Secure-seed-and-matter-seed-command.patch +++ b/luminol-server/minecraft-patches/features/0053-Leaf-Secure-seed-and-matter-seed-command.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Tue, 28 Jan 2025 18:56:53 +0800 -Subject: [PATCH] Leaf Secure seed and matter seed command +Subject: [PATCH] Leaf: Secure seed and matter seed command -Co-authored by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> -As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/ver/1.21.4/leaf-server/minecraft-patches/features/0049-Matter-Secure-Seed.patch and https://github.com/Winds-Studio/Leaf/blob/ver/1.21.4/leaf-server/minecraft-patches/features/0050-Matter-Secure-Seed-command.patch) -Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) +Co-authored by: Apehum +As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/leaf-server/paper-patches/features/0019-Matter-Secure-Seed.patch and https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/leaf-server/minecraft-patches/features/0050-Matter-Secure-Seed-command.patch) +Licensed under: GPL-3.0 (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/licenses/GPL-3.0.txt) diff --git a/net/minecraft/server/commands/SeedCommand.java b/net/minecraft/server/commands/SeedCommand.java index a65affc41a4fc299bc2281f0f53f2e075633899d..f071e469468b768bd9c063d78c222b1b3e3b13bd 100644 diff --git a/luminol-server/minecraft-patches/features/0056-Leaves-Disable-moved-wrongly-threshold.patch b/luminol-server/minecraft-patches/features/0056-Leaves-Disable-moved-wrongly-threshold.patch index 4e822a4..c566cb2 100644 --- a/luminol-server/minecraft-patches/features/0056-Leaves-Disable-moved-wrongly-threshold.patch +++ b/luminol-server/minecraft-patches/features/0056-Leaves-Disable-moved-wrongly-threshold.patch @@ -1,10 +1,10 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: adabugra <57899270+adabugra@users.noreply.github.com> Date: Fri, 31 Jan 2025 19:17:01 +0300 -Subject: [PATCH] Leaves Disable moved wrongly threshold +Subject: [PATCH] Leaves: Disable moved wrongly threshold Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com> -As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/master/patches/removed/server/0099-Disable-moved-wrongly-threshold.patch) +As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/f553c53e4230aa032e54a69b6479f1959ed24a60/patches/removed/server/0099-Disable-moved-wrongly-threshold.patch) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/luminol-server/minecraft-patches/features/0057-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch b/luminol-server/minecraft-patches/features/0057-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch index c6496eb..985fbdc 100644 --- a/luminol-server/minecraft-patches/features/0057-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch +++ b/luminol-server/minecraft-patches/features/0057-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch @@ -1,10 +1,10 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sat, 8 Feb 2025 14:25:16 +0800 -Subject: [PATCH] Leaves Fix Incorrect Collision Behavior for Block Shape +Subject: [PATCH] Leaves: Fix Incorrect Collision Behavior for Block Shape Co-authored by: Fortern -As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/master/leaves-server/minecraft-patches/features/0110-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch) +As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/f553c53e4230aa032e54a69b6479f1959ed24a60/leaves-server/minecraft-patches/features/0110-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java b/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java diff --git a/luminol-server/minecraft-patches/features/0058-Leaves-Fix-SculkCatalyst-exp-skip.patch b/luminol-server/minecraft-patches/features/0058-Leaves-Fix-SculkCatalyst-exp-skip.patch index eec2159..797c5fe 100644 --- a/luminol-server/minecraft-patches/features/0058-Leaves-Fix-SculkCatalyst-exp-skip.patch +++ b/luminol-server/minecraft-patches/features/0058-Leaves-Fix-SculkCatalyst-exp-skip.patch @@ -1,10 +1,10 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: violetc <58360096+s-yh-china@users.noreply.github.com> -Date: Sun, 6 Apr 2025 10:42:45 +0800 -Subject: [PATCH] Leaves Fix SculkCatalyst exp skip +From: Helvetica Volubi +Date: Mon, 28 Apr 2025 22:51:32 +0800 +Subject: [PATCH] Leaves: Fix SculkCatalyst exp skip Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com> -As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/master/leaves-server/paper-patches/features/0016-Fix-SculkCatalyst-exp-skip.patch) +As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/f553c53e4230aa032e54a69b6479f1959ed24a60/leaves-server/paper-patches/features/0016-Fix-SculkCatalyst-exp-skip.patch) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java diff --git a/luminol-server/minecraft-patches/features/0060-Add-config-to-enable-Cross-Region-Damage-trace.patch b/luminol-server/minecraft-patches/features/0059-Add-config-to-enable-Cross-Region-Damage-trace.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0060-Add-config-to-enable-Cross-Region-Damage-trace.patch rename to luminol-server/minecraft-patches/features/0059-Add-config-to-enable-Cross-Region-Damage-trace.patch diff --git a/luminol-server/minecraft-patches/features/0059-Add-config-to-enable-Raytracing-tracker.patch b/luminol-server/minecraft-patches/features/0060-Add-config-to-enable-Raytracing-tracker.patch similarity index 99% rename from luminol-server/minecraft-patches/features/0059-Add-config-to-enable-Raytracing-tracker.patch rename to luminol-server/minecraft-patches/features/0060-Add-config-to-enable-Raytracing-tracker.patch index c071abd..60feacd 100644 --- a/luminol-server/minecraft-patches/features/0059-Add-config-to-enable-Raytracing-tracker.patch +++ b/luminol-server/minecraft-patches/features/0060-Add-config-to-enable-Raytracing-tracker.patch @@ -3,7 +3,6 @@ From: MrHua269 Date: Wed, 5 Feb 2025 15:22:19 +0800 Subject: [PATCH] Add config to enable Raytracing tracker -Based on the framework of EntityCulling((((((( diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java index 7eff847790394aecd058e7a61905da86163b4c6e..9099457f55a2829297ac1db8a69a98ff717d9a86 100644