From c5194eeb8f5ea68c86b1c7daa7e780ebb77aba66 Mon Sep 17 00:00:00 2001 From: Bacteriawa Date: Sat, 11 Apr 2026 03:40:59 +0800 Subject: [PATCH] Update Luminol --- gradle.properties | 2 +- ...2-Add-config-to-enable-cross-region-damage-trace.patch | 4 ++-- .../0004-Add-config-to-enable-function-command.patch | 2 +- .../0005-Add-config-to-enable-save-all-command.patch | 2 +- .../0006-Add-config-to-enable-scoreboard-command.patch | 2 +- .../features/0007-Add-config-to-enable-tick-command.patch | 4 ++-- .../features/0011-Leaves-Item-overstack-util.patch | 4 ++-- .../features/0021-Spawn-invulnerable-time.patch | 2 +- .../features/0024-Leaves-Syncmatica-Protocol.patch | 2 +- .../features/0026-Leaves-Jade-Protocol.patch | 2 +- .../features/0029-Leaves-Wool-Hopper-Counter.patch | 2 +- ...0030-Leaves-Alternative-block-placement-Protocol.patch | 2 +- .../features/0035-Instant-Block-Updater.patch | 6 +++--- .../features/0040-Global-Entities-Counter.patch | 6 +++--- ...Add-null-check-in-RegionizedWorldData-conections.patch | 8 ++++---- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gradle.properties b/gradle.properties index ab25d13..19e0556 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ apiVersion=1.21.11 release=2 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=80dfcadee21db699a0a653e0d7998ef5341d7213 +luminolRef=75b98df42c5a3dcaa2e94f001f02aad3c22a52bf org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0002-Add-config-to-enable-cross-region-damage-trace.patch b/lophine-server/minecraft-patches/features/0002-Add-config-to-enable-cross-region-damage-trace.patch index 355e11a..7582a16 100644 --- a/lophine-server/minecraft-patches/features/0002-Add-config-to-enable-cross-region-damage-trace.patch +++ b/lophine-server/minecraft-patches/features/0002-Add-config-to-enable-cross-region-damage-trace.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable cross region damage trace diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 08e0dde0aa5ff94b72127abcd7da2a63d5701db8..e311502c156076842c5dcd91c70a94e414312100 100644 +index 607ce65a719e333ce2275346a356032327d00ccf..dcdb01fe5333d407a10f9872d09992c7b438ddeb 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1445,6 +1445,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @@ -48,7 +48,7 @@ index 08e0dde0aa5ff94b72127abcd7da2a63d5701db8..e311502c156076842c5dcd91c70a94e4 AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0); this.level() diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index c67c29278ea63ab8b936d53bf654089f2dba2eef..88d532d11c29bd8cfe5b6b02847d960b07cf0a38 100644 +index 7a63f52efca133d9d1a773da2443333009d87113..5bae274f5ee869e540e4330e03af671b6b18313d 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -1975,6 +1975,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/lophine-server/minecraft-patches/features/0004-Add-config-to-enable-function-command.patch b/lophine-server/minecraft-patches/features/0004-Add-config-to-enable-function-command.patch index 262aed2..b9a1806 100644 --- a/lophine-server/minecraft-patches/features/0004-Add-config-to-enable-function-command.patch +++ b/lophine-server/minecraft-patches/features/0004-Add-config-to-enable-function-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable function command diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 9c0c3835776bda3bab08f0abaffc89a72bba0bfc..b95d144dd479d339cc4b0f92cc4c3bade9af4927 100644 +index 4fa276ba05a550cdf7ce48617056c5a4d4a18006..6cb0d4daf0f275b95d5ca09275e40ab32258eb39 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -215,7 +215,9 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-save-all-command.patch b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-save-all-command.patch index fd9487f..806f6a5 100644 --- a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-save-all-command.patch +++ b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-save-all-command.patch @@ -48,7 +48,7 @@ index 6cb0d4daf0f275b95d5ca09275e40ab32258eb39..48628174299f8f18170198df1834d617 SaveOnCommand.register(this.dispatcher); SetPlayerIdleTimeoutCommand.register(this.dispatcher); diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 4be383909addfebc0ca3b007d4ef2ec30ed445f7..fa60388376e9dafc5e1b71b6e78550bb6cd4009b 100644 +index 8ce5cdda24d63b33b39e32f9712fafa3917f27c5..25324d81bbe876dbe47b33bd5749b72e4283bf80 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1656,6 +1656,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop i) { source.sendFailure(Component.translatable("commands.give.failed.toomanyitems", i, itemStack.getDisplayName())); diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3acd8d2226d4a7ba8fcecc1cc715b01cc9ce63d1..cc82414e813fe0a97bfd405096d06ad279098479 100644 +index 5c5dfcefd9ce6c9d7f69fb6d03216805b9e63822..d35ef52a6adb9a560138d1a2af32969c3a73f42b 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3170,7 +3170,7 @@ public class ServerGamePacketListenerImpl @@ -446,7 +446,7 @@ index 8f80c469c309bf61328c4f98037495f47a38c3c1..b4127d4b4386b98205275a9a0ef8067c } diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index f851e0f7d727cb9dca70c578777d871af424388c..6a51bace3151646afae9de820d9c8977a0221df4 100644 +index 53c50d776e5ca66e5903a464d763a7df5b7672be..6cdb59762b5b223a220d420ff99fa9eadc64f3e0 100644 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -145,7 +145,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/lophine-server/minecraft-patches/features/0021-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0021-Spawn-invulnerable-time.patch index 7a3b565..3c35517 100644 --- a/lophine-server/minecraft-patches/features/0021-Spawn-invulnerable-time.patch +++ b/lophine-server/minecraft-patches/features/0021-Spawn-invulnerable-time.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn invulnerable time diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index ec34282744c71c881392ff278a8b03af90de8151..f0d45cb70af62b747c9235941f3fc45221b3b8e6 100644 +index dcdb01fe5333d407a10f9872d09992c7b438ddeb..6df8f98afa7810815b8d7c86b3dac57cd5915682 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -240,6 +240,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch b/lophine-server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch index f30bc60..7936d45 100644 --- a/lophine-server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch @@ -9,7 +9,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves) 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 -index 1a749d9bee139975fa249839df93c3a1e48bf102..d81e22fe65cded98c201a7bbae8a51b22c6a20b4 100644 +index d35ef52a6adb9a560138d1a2af32969c3a73f42b..df66e24c61af9d57d619c91849e28f1bec64a036 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -338,9 +338,12 @@ public class ServerGamePacketListenerImpl diff --git a/lophine-server/minecraft-patches/features/0026-Leaves-Jade-Protocol.patch b/lophine-server/minecraft-patches/features/0026-Leaves-Jade-Protocol.patch index 6caea10..a571779 100644 --- a/lophine-server/minecraft-patches/features/0026-Leaves-Jade-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0026-Leaves-Jade-Protocol.patch @@ -22,7 +22,7 @@ index 7c2d53ca863c2e50c6871938efc426ddefff9b5c..8c1e6837b0328c66fdda322c3c7ceba3 // Luminol End - Cross Region Damage trace } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3aa7e5fb13326bd3667d470adbc7df7b7e9b19b4..6de8c1010b57aaeab0c97e2836cee5bf4b087578 100644 +index df66e24c61af9d57d619c91849e28f1bec64a036..8386757c5fd3d8df3ae77a4eeeb25a2f28840cda 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3843,7 +3843,7 @@ public class ServerGamePacketListenerImpl diff --git a/lophine-server/minecraft-patches/features/0029-Leaves-Wool-Hopper-Counter.patch b/lophine-server/minecraft-patches/features/0029-Leaves-Wool-Hopper-Counter.patch index 0b47fbf..d1cba13 100644 --- a/lophine-server/minecraft-patches/features/0029-Leaves-Wool-Hopper-Counter.patch +++ b/lophine-server/minecraft-patches/features/0029-Leaves-Wool-Hopper-Counter.patch @@ -10,7 +10,7 @@ Licensed under: MIT This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet) diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 6a51bace3151646afae9de820d9c8977a0221df4..474ca0ce0d3095fc586f8f9e9a584ed4f7c91471 100644 +index 6cdb59762b5b223a220d420ff99fa9eadc64f3e0..fe93f0d6b2b7e8503da068179f5d7667634c7ff3 100644 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -229,8 +229,30 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch b/lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch index a071580..db2b9d0 100644 --- a/lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch @@ -13,7 +13,7 @@ MasaGadget(https://github.com/plusls/MasaGadget) litematica(https://github.com/maruohon/litematica) diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 43e9fd5684d15f8643524132e60266071c6dc454..62db0ba9c824959f953d452ab7aafcde01b10bcd 100644 +index 8386757c5fd3d8df3ae77a4eeeb25a2f28840cda..fd74636d911596daae8cfe563c2dd5e3d37a1549 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2134,7 +2134,7 @@ public class ServerGamePacketListenerImpl diff --git a/lophine-server/minecraft-patches/features/0035-Instant-Block-Updater.patch b/lophine-server/minecraft-patches/features/0035-Instant-Block-Updater.patch index fcc86a0..77b9db3 100644 --- a/lophine-server/minecraft-patches/features/0035-Instant-Block-Updater.patch +++ b/lophine-server/minecraft-patches/features/0035-Instant-Block-Updater.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Instant Block Updater diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java -index 6de3e60d63a838cf9d24822cbbf1cd2b445e6b4d..782f6810d4ed99052169c7099318dc8a2f8937b0 100644 +index 33d186d660ce3e3dc8cf26cd521fa99291ff78a5..ce1918d12b88835ea79a5c0dc90e0315c408830b 100644 --- a/io/papermc/paper/threadedregions/RegionizedWorldData.java +++ b/io/papermc/paper/threadedregions/RegionizedWorldData.java -@@ -482,7 +482,7 @@ public final class RegionizedWorldData { +@@ -494,7 +494,7 @@ public final class RegionizedWorldData { public long lastMidTickExecuteFailure; // From Level public boolean populating; @@ -17,7 +17,7 @@ index 6de3e60d63a838cf9d24822cbbf1cd2b445e6b4d..782f6810d4ed99052169c7099318dc8a public boolean captureBlockStates = false; public boolean captureTreeGeneration = false; public final Map capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper -@@ -570,7 +570,7 @@ public final class RegionizedWorldData { +@@ -582,7 +582,7 @@ public final class RegionizedWorldData { this.world = world; this.blockLevelTicks = new LevelTicks<>(world::isPositionTickingWithEntitiesLoaded, world, true); this.fluidLevelTicks = new LevelTicks<>(world::isPositionTickingWithEntitiesLoaded, world, false); diff --git a/lophine-server/minecraft-patches/features/0040-Global-Entities-Counter.patch b/lophine-server/minecraft-patches/features/0040-Global-Entities-Counter.patch index 7911643..641a363 100644 --- a/lophine-server/minecraft-patches/features/0040-Global-Entities-Counter.patch +++ b/lophine-server/minecraft-patches/features/0040-Global-Entities-Counter.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Global Entities Counter diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java -index 782f6810d4ed99052169c7099318dc8a2f8937b0..e166c430938eb22bb90d651298562d704fa8f1d9 100644 +index ce1918d12b88835ea79a5c0dc90e0315c408830b..c5caad99caed20e2bb4475fcf057417ee27d737c 100644 --- a/io/papermc/paper/threadedregions/RegionizedWorldData.java +++ b/io/papermc/paper/threadedregions/RegionizedWorldData.java -@@ -564,6 +564,9 @@ public final class RegionizedWorldData { +@@ -576,6 +576,9 @@ public final class RegionizedWorldData { } // Luminol end @@ -18,7 +18,7 @@ index 782f6810d4ed99052169c7099318dc8a2f8937b0..e166c430938eb22bb90d651298562d70 public final TickRegions.TickRegionData regionData; public RegionizedWorldData(final ServerLevel world, final TickRegions.TickRegionData regionData) { -@@ -576,6 +579,15 @@ public final class RegionizedWorldData { +@@ -588,6 +591,15 @@ public final class RegionizedWorldData { this.turbo = new io.papermc.paper.redstone.RedstoneWireTurbo((RedStoneWireBlock)Blocks.REDSTONE_WIRE); this.regionData = regionData; diff --git a/lophine-server/minecraft-patches/features/0041-Add-null-check-in-RegionizedWorldData-conections.patch b/lophine-server/minecraft-patches/features/0041-Add-null-check-in-RegionizedWorldData-conections.patch index ccf4be2..f3df18f 100644 --- a/lophine-server/minecraft-patches/features/0041-Add-null-check-in-RegionizedWorldData-conections.patch +++ b/lophine-server/minecraft-patches/features/0041-Add-null-check-in-RegionizedWorldData-conections.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add null check in RegionizedWorldData >> conections some of our function patches will crash because of get null in conn.getPlayer(), then when we process player.chunkPosition() will get NPE, so we need to fix it. diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java -index e166c430938eb22bb90d651298562d704fa8f1d9..bb6e46644f23fcf3d785f20003f01ea22ee75430 100644 +index c5caad99caed20e2bb4475fcf057417ee27d737c..c2e50a03a41958d9b44753adc9a9bf4ea1fb24a4 100644 --- a/io/papermc/paper/threadedregions/RegionizedWorldData.java +++ b/io/papermc/paper/threadedregions/RegionizedWorldData.java -@@ -239,14 +239,17 @@ public final class RegionizedWorldData { +@@ -251,14 +251,17 @@ public final class RegionizedWorldData { regionToData.get(CoordinateUtils.getChunkKey(pos.x >> chunkToRegionShift, pos.z >> chunkToRegionShift)).itemEntityMovementTrackerMap.put(key, tracker); } // Luminol end @@ -27,7 +27,7 @@ index e166c430938eb22bb90d651298562d704fa8f1d9..bb6e46644f23fcf3d785f20003f01ea2 } // entities for (final ServerPlayer player : from.localPlayers) { -@@ -257,6 +260,13 @@ public final class RegionizedWorldData { +@@ -269,6 +272,13 @@ public final class RegionizedWorldData { into.localPlayers.add(player); player.getBukkitEntity().updateRegion(into); into.nearbyPlayers.addPlayer(player); @@ -41,7 +41,7 @@ index e166c430938eb22bb90d651298562d704fa8f1d9..bb6e46644f23fcf3d785f20003f01ea2 } for (final Entity entity : from.allEntities) { final ChunkPos pos = entity.chunkPosition(); -@@ -624,6 +634,7 @@ public final class RegionizedWorldData { +@@ -636,6 +646,7 @@ public final class RegionizedWorldData { private static void cleanUpConnection(final Connection conn) { // note: ALL connections HERE have a player final ServerPlayer player = conn.getPlayer();