From 79dbac2a8eb072c11d45478aa007090ed869478a Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Thu, 4 Sep 2025 17:30:46 +0800 Subject: [PATCH] Update Luminol --- .github/workflows/build.yml | 2 ++ gradle.properties | 2 +- ...5-Add-config-to-enable-datapack-command.patch | 4 ++-- .../0009-Leaves-Base-Protocol-Core.patch | 4 ++-- .../features/0021-Leaves-Leaves-Fakeplayer.patch | 16 ++++++++-------- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da1c071..f39708c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,6 +66,8 @@ jobs: body: | 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }}) This release is automatically compiled by GitHub Actions + ### Branch Info + ${{ github.ref_name }} ### Commit Message ${{ env.commit_msg }} artifacts: ${{ env.jar_dir }} diff --git a/gradle.properties b/gradle.properties index 6de1f1c..5cb97fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ mcVersion=1.21.8 release=2 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=a3bc02dca9dba9ee552e9ee03bad3253c1707f88 +luminolRef=e7176d188b9e4d3b1f258d56cda91e2d008282f4 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-datapack-command.patch b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-datapack-command.patch index c2570b9..8b81ced 100644 --- a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-datapack-command.patch +++ b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-datapack-command.patch @@ -20,10 +20,10 @@ index e05f75b6bbd48d6fb7379926d68d5f8ed6014be9..af895859057ca303177ec3c8a07cf753 DefaultGameModeCommands.register(this.dispatcher); //DialogCommand.register(this.dispatcher, context); // Folia - region threading - TODO diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 100e8fdc52c201d386e3c779d19f6b5abde39820..d08a5b553f4e5932d960fbcdeb6a43419730e32a 100644 +index 75027e73859c955a54034640f905cb5d91a6a2f4..b4b3ff86f7c4afb94fc4da5133746391a078a7fb 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -2352,6 +2352,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop CompletableFuture submit(java.util.function.Supplier task) { -@@ -2226,9 +2227,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0) { // Folia - region threading - this is complicated to implement, and even if done correctly is messy @@ -62,7 +62,7 @@ index af13707933af14171447d5ab6faacb64ddf194a7..e5e3a9c6443019d31496b1cf2154f5c3 this.emptyTicks++; } else { this.emptyTicks = 0; -@@ -1912,6 +1915,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop ((1L + this.totalEatTimeTicks) * 50L * (1000L * 1000L)); @@ -587,7 +587,7 @@ index a8348a073682eec31990e9ab963b11ad32cf8bf8..8ce6f3f1a931628e018ce9a2e0c404b8 this.useItemRemaining = 0; // Paper end - lag compensate eating this.completeUsingItem(); -@@ -4223,6 +4223,23 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -4239,6 +4239,23 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin this.stopUsingItem(); }