From 0f67f445b9fe2c196f9b56525a339c5b16e4b007 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Sun, 4 Jan 2026 12:32:42 +0800 Subject: [PATCH] Update Luminol --- gradle.properties | 2 +- ...-to-enable-cross-region-damage-trace.patch | 8 +++---- ...-config-to-enable-raytracing-tracker.patch | 4 ++-- ...s-Configurable-trading-with-the-void.patch | 6 ++--- .../0015-Leaves-Servux-Protocol.patch | 4 ++-- ...x-for-Raid-Revert-and-Cross-Region-D.patch | 4 ++-- .../features/0022-Leaves-Fakeplayer.patch | 22 +++++++++---------- .../features/0031-Leaves-Replay-Mod-API.patch | 16 +++++++------- ...eaves-Catch-update-suppression-crash.patch | 6 ++--- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/gradle.properties b/gradle.properties index 609069c..520f35e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ apiVersion=1.21.11 release=1 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=63345764020f6191146ddbe3398156c6c3e6a96b +luminolRef=ac1ab569a3af762fc0569bc2842ed5718d94460b 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 709c2bf..c3cdb9e 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 @@ -48,10 +48,10 @@ index 147cd8742196e52567625a1017f63d7a7e770e44..d17ad8bf49c4911e5939ad25c1822bb4 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 80994688d3dd23dbc9de3ccfe739ca4acc66c2a0..b9f52fb032f1465a749f40b656a1d125caf8194f 100644 +index c67c29278ea63ab8b936d53bf654089f2dba2eef..88d532d11c29bd8cfe5b6b02847d960b07cf0a38 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java -@@ -1972,6 +1972,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -1975,6 +1975,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin final LivingEntity killer = this.getKillCredit(); if (killer != null) { killer.awardKillScore(this, damageSource); @@ -65,7 +65,7 @@ index 80994688d3dd23dbc9de3ccfe739ca4acc66c2a0..b9f52fb032f1465a749f40b656a1d125 } }); // Paper end this.postDeathDropItems(deathEvent); // Paper -@@ -1982,6 +1989,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -1985,6 +1992,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin return deathEvent; // Paper } @@ -84,7 +84,7 @@ index 80994688d3dd23dbc9de3ccfe739ca4acc66c2a0..b9f52fb032f1465a749f40b656a1d125 protected void dropEquipment(ServerLevel level) { } protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {} // Paper - method for post death logic that cannot be ran before the event is potentially cancelled -@@ -2609,6 +2628,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -2612,6 +2631,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin } } diff --git a/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-raytracing-tracker.patch b/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-raytracing-tracker.patch index dd93d00..f1d637a 100644 --- a/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-raytracing-tracker.patch +++ b/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-raytracing-tracker.patch @@ -18,7 +18,7 @@ index bca2c5410aa543d2bb421e53893e9163508b3568..fdccb06c918d387e46c29ede7337159d double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1); if (rangeY != -1) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 1eee289eb288698a419f6c89e81c0acd9e63e1bd..2339381a0bf75b8ffe24e7b2b618631703408e23 100644 +index da6da815b7ca1270507d69dc563880c70523d094..b4ebc26ef54aefdb14fca1f958dc0156cb1df642 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -152,7 +152,7 @@ import org.jetbrains.annotations.Contract; @@ -30,7 +30,7 @@ index 1eee289eb288698a419f6c89e81c0acd9e63e1bd..2339381a0bf75b8ffe24e7b2b6186317 // CraftBukkit start private static final int CURRENT_LEVEL = 2; static boolean isLevelAtLeast(ValueInput input, int level) { -@@ -6463,4 +6463,46 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name +@@ -6444,4 +6444,46 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name // Paper end - Expose entity id counter public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG diff --git a/lophine-server/minecraft-patches/features/0010-Leaves-Configurable-trading-with-the-void.patch b/lophine-server/minecraft-patches/features/0010-Leaves-Configurable-trading-with-the-void.patch index 8016619..be90552 100644 --- a/lophine-server/minecraft-patches/features/0010-Leaves-Configurable-trading-with-the-void.patch +++ b/lophine-server/minecraft-patches/features/0010-Leaves-Configurable-trading-with-the-void.patch @@ -8,10 +8,10 @@ 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/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index a60c70550c217bccda6695dc7b7165de8e97e5cd..6aad6024dc121eae63b7fde92a89cbea29fcafb3 100644 +index 4fa29d777a56b3296ea5e5fb4b9cb3300a7dda31..9a3b6d20b149b0937b5bc23807e381a08ae03b0f 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -3015,7 +3015,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -3024,7 +3024,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe // Spigot start if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message // Paper start - Fix merchant inventory not closing on entity removal @@ -21,7 +21,7 @@ index a60c70550c217bccda6695dc7b7165de8e97e5cd..6aad6024dc121eae63b7fde92a89cbea } // Paper end - Fix merchant inventory not closing on entity removal diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index a8a034ad5895ad1b833754c91c3a370c3b9b3744..35d51c727ce9229a174c45e9ea838fa9e3c3d80a 100644 +index c8be04b8a50bac52150a1fdd238634e630e1765e..2eb551390aa66d89988df9ca23cf0dd7ccfd6577 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -555,7 +555,7 @@ public abstract class PlayerList { diff --git a/lophine-server/minecraft-patches/features/0015-Leaves-Servux-Protocol.patch b/lophine-server/minecraft-patches/features/0015-Leaves-Servux-Protocol.patch index bc0b2b5..842bd07 100644 --- a/lophine-server/minecraft-patches/features/0015-Leaves-Servux-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0015-Leaves-Servux-Protocol.patch @@ -23,10 +23,10 @@ index 95f6b1cbd5e33151c326689bc72292ff38a48803..e1974bbebbd10b75ea02955d9ced198d + // Leaves end - servux } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 6aad6024dc121eae63b7fde92a89cbea29fcafb3..90e363a310936830788aee6484a63a989aa316e7 100644 +index 9a3b6d20b149b0937b5bc23807e381a08ae03b0f..354647c41fadfdadcc9b1664ac3ccbf8d29571f4 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -2442,6 +2442,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2451,6 +2451,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.server.updateEffectiveRespawnData(); } // Paper end diff --git a/lophine-server/minecraft-patches/features/0017-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch b/lophine-server/minecraft-patches/features/0017-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch index 8ae3d51..20bca2a 100644 --- a/lophine-server/minecraft-patches/features/0017-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch +++ b/lophine-server/minecraft-patches/features/0017-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Compatibility fix for Raid Revert and Cross Region Damage diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index b9f52fb032f1465a749f40b656a1d125caf8194f..93201c8d74a77ea47c6f53503939714fb5e94b88 100644 +index 88d532d11c29bd8cfe5b6b02847d960b07cf0a38..fa6ed83a69aafee57195f1b512481c401ade7b09 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java -@@ -1237,6 +1237,29 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -1240,6 +1240,29 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin } } diff --git a/lophine-server/minecraft-patches/features/0022-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0022-Leaves-Fakeplayer.patch index c6c0e7e..b2689fe 100644 --- a/lophine-server/minecraft-patches/features/0022-Leaves-Fakeplayer.patch +++ b/lophine-server/minecraft-patches/features/0022-Leaves-Fakeplayer.patch @@ -100,7 +100,7 @@ index 951953427b5b18cfc187b0ab04e1f3bbfd0ea6c4..eaf770a1b78e002c0559c0bfdad416e1 @Override public void close() { diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java -index 98004b77b7f40d315f41be82105df6d4b9000e33..cd968c6971d054d9b66a0eaea4753a51ebb75b02 100644 +index c9e6cd428e4c74b14a992de9ffe85a5a707c4e6b..5bf7eb5b906cefa57a1dfcf828ff7872dbceac4f 100644 --- a/net/minecraft/server/PlayerAdvancements.java +++ b/net/minecraft/server/PlayerAdvancements.java @@ -166,6 +166,11 @@ public class PlayerAdvancements { @@ -255,7 +255,7 @@ index fdccb06c918d387e46c29ede7337159db8c5d9ca..4cd5c5659ac098c3b7ff95efb94b1987 } } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 7c9a242014acb240589845b36f04fbcc1a6f810c..bd0194ecfaec9d6dd309587d82113ed025c20edf 100644 +index 354647c41fadfdadcc9b1664ac3ccbf8d29571f4..f41cab482168ca7b0764b371533658374dc4cc3a 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -274,7 +274,7 @@ index 7c9a242014acb240589845b36f04fbcc1a6f810c..bd0194ecfaec9d6dd309587d82113ed0 } // Folia start - region threading -@@ -2469,6 +2471,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2478,6 +2480,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe return this.players; } @@ -287,7 +287,7 @@ index 7c9a242014acb240589845b36f04fbcc1a6f810c..bd0194ecfaec9d6dd309587d82113ed0 @Override public void updatePOIOnBlockStateChange(BlockPos pos, BlockState oldState, BlockState newState) { Optional> optional = PoiTypes.forState(oldState); -@@ -2942,6 +2950,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2951,6 +2959,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe // ServerLevel.this.getChunkSource().addEntity(entity); // Paper - ignore and warn about illegal addEntity calls instead of crashing server; moved down below valid=true if (entity instanceof ServerPlayer serverPlayer) { ServerLevel.this.players.add(serverPlayer); @@ -299,7 +299,7 @@ index 7c9a242014acb240589845b36f04fbcc1a6f810c..bd0194ecfaec9d6dd309587d82113ed0 if (serverPlayer.isReceivingWaypoints()) { ServerLevel.this.getWaypointManager().addPlayer(serverPlayer); } -@@ -3029,6 +3042,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -3038,6 +3051,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe ServerLevel.this.getChunkSource().removeEntity(entity); if (entity instanceof ServerPlayer serverPlayer) { ServerLevel.this.players.remove(serverPlayer); @@ -534,7 +534,7 @@ index bd1d4a832eec4c89a7f8bdd5d066b6074f206d81..d7224c2297eb5d580349da3b2770895f for (WaypointTransmitter waypointTransmitter : this.waypoints) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 89fbe7121e775af4115a90a114494ac6cb7b2727..80c126507030cee85a648903b1c57cd26f77108c 100644 +index b4ebc26ef54aefdb14fca1f958dc0156cb1df642..04ce4cb64e92b63437a216c0cb8318c7e17e23a0 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1252,7 +1252,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name @@ -546,7 +546,7 @@ index 89fbe7121e775af4115a90a114494ac6cb7b2727..80c126507030cee85a648903b1c57cd2 this.checkFallDamage(vec3.y, this.onGround(), blockState, onPosLegacy); } -@@ -1577,7 +1577,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name +@@ -1587,7 +1587,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name } // Paper start - optimise collisions @@ -556,10 +556,10 @@ index 89fbe7121e775af4115a90a114494ac6cb7b2727..80c126507030cee85a648903b1c57cd2 final boolean yZero = movement.y == 0.0; final boolean zZero = movement.z == 0.0; diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 93201c8d74a77ea47c6f53503939714fb5e94b88..347af65f4f4388b69022a69328491c7022855b16 100644 +index fa6ed83a69aafee57195f1b512481c401ade7b09..97b0f407306e978a506225684ac0a5aeef1d6b3f 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java -@@ -3316,7 +3316,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -3319,7 +3319,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin private void travelRidden(Player player, Vec3 travelVector) { Vec3 riddenInput = this.getRiddenInput(player, travelVector); this.tickRidden(player, riddenInput); @@ -568,7 +568,7 @@ index 93201c8d74a77ea47c6f53503939714fb5e94b88..347af65f4f4388b69022a69328491c70 this.setSpeed(this.getRiddenSpeed(player)); this.travel(riddenInput); } else { -@@ -4225,7 +4225,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -4228,7 +4228,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin // Paper start - lag compensate eating // we add 1 to the expected time to avoid lag compensating when we should not final boolean shouldLagCompensate = this.useItem.has(DataComponents.FOOD) && this.eatStartTime != -1 && (System.nanoTime() - this.eatStartTime) > ((1L + this.totalEatTimeTicks) * 50L * (1000L * 1000L)); @@ -577,7 +577,7 @@ index 93201c8d74a77ea47c6f53503939714fb5e94b88..347af65f4f4388b69022a69328491c70 this.useItemRemaining = 0; // Paper end - lag compensate eating this.completeUsingItem(); -@@ -4410,6 +4410,23 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -4413,6 +4413,23 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin this.stopUsingItem(); } diff --git a/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch b/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch index 690a769..a5fa71b 100644 --- a/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch +++ b/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch @@ -84,7 +84,7 @@ index af71e0e1eb1c93745f3e4954ecc8fbd2ad4808a3..f3829564681faff3ae8971ed90b947b4 players.add(serverPlayer1); if (players.size() >= resultLimit) { diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 744b780075bf76fa0fa5e27699a146701289e0d8..c8f2f98ebc145063505b73ef7c723f2878d34ea3 100644 +index eaf770a1b78e002c0559c0bfdad416e1bf1dda9d..62069db658d188abdacf071f33e93e11f1467300 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1895,7 +1895,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop