Fix incorrectly synced data after player teleportation

* feat: tick command support

* feat: use exp-config to enable tick command

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  # Enable version updates for github actions
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/build_1.21.4.yml

@@ -41,7 +41,7 @@ jobs:
         uses: "actions/upload-artifact@v4"
         with:
           name: "${{ env.project_id_b }} CI Artifacts"
-          path: "luminol-server/build/libs/*.jar"
+          path: "luminol-server/build/libs/*-paperclip-*-mojmap.jar"
       - name: SetENV
         if: github.event_name != 'pull_request'
         run: sh scripts/SetENV.sh
@@ -58,7 +58,6 @@ jobs:
             ${{ env.commit_msg }}
           artifacts: |
             ${{ env.jar_dir }}
-            ${{ env.jar_dir_bundler }}
           generateReleaseNotes: true
           prerelease: ${{ env.pre }}
           makeLatest: ${{ env.make_latest }}

gradle.properties

@@ -2,7 +2,7 @@ group = me.earthme.luminol
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
 
-foliaRef=d3969cdc419b84e2d94c13854d4eb94ae2e0b7be
+foliaRef=cd49d650b27aa329358593a84ef77444538ef014
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

luminol-api/paper-patches/features/0007-Tick-regions-api.patch

@@ -186,10 +186,10 @@ index 0000000000000000000000000000000000000000..ecde4462b08d701b8bff9f26902f1775
 +    RegionStats getRegionStats();
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 015d852d5a0c01042a2153a6916d408660356c59..c7b6f3f6c42746297816c0650571990f565d5e68 100644
+index bff01411f4b2d3ecd9e6d807c3f450d72c108323..1d74f4814d5c87d6cd1320634e5610cac16d32c5 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4432,4 +4432,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4437,4 +4437,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
              }
          }
      }

luminol-api/paper-patches/features/0008-Leaves-Fix-SculkCatalyst-exp-skip.patch

@@ -0,0 +1,59 @@
+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:47 +0800
+Subject: [PATCH] Leaves Fix SculkCatalyst exp skip
+
+
+diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
+index 42ffb81708b327f765ba3235fdd1ab69cd7589fd..0a7e37420f8d024ffba1fd1c52edc50c10408e6e 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
++++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
+@@ -25,17 +25,25 @@ public class EntityDeathEvent extends EntityEvent implements org.bukkit.event.Ca
+     private float deathSoundVolume;
+     private float deathSoundPitch;
+     // Paper end
++    private int rewardExp; // Leaves - exp fix
+ 
+     public EntityDeathEvent(@NotNull final LivingEntity entity, @NotNull DamageSource damageSource, @NotNull final List<ItemStack> drops) {
+         this(entity, damageSource, drops, 0);
+     }
+ 
+     public EntityDeathEvent(@NotNull final LivingEntity what, @NotNull DamageSource damageSource, @NotNull final List<ItemStack> drops, final int droppedExp) {
++    // Leaves start - exp fix
++        this(what, damageSource, drops, droppedExp, droppedExp);
++    }
++
++    public EntityDeathEvent(@NotNull final LivingEntity what, @NotNull DamageSource damageSource, @NotNull final List<ItemStack> drops, final int droppedExp, final int rewardExp) {
+         super(what);
+         this.damageSource = damageSource;
+         this.drops = drops;
+         this.dropExp = droppedExp;
++        this.rewardExp = rewardExp;
+     }
++    // Leaves end - exp fix
+ 
+     @NotNull
+     @Override
+@@ -75,6 +83,7 @@ public class EntityDeathEvent extends EntityEvent implements org.bukkit.event.Ca
+      */
+     public void setDroppedExp(int exp) {
+         this.dropExp = exp;
++        this.rewardExp = exp; // Leaves - exp fix
+     }
+ 
+     /**
+@@ -226,4 +235,14 @@ public class EntityDeathEvent extends EntityEvent implements org.bukkit.event.Ca
+         this.deathSoundPitch = pitch;
+     }
+     // Paper end
++
++    // Leaves start - exp fix
++    public int getRewardExp() {
++        return rewardExp;
++    }
++
++    public void setRewardExp(int rewardExp) {
++        this.rewardExp = rewardExp;
++    }
++    // Leaves end - exp fix
+ }

luminol-api/paper-patches/features/0010-Leaves-Fix-SculkCatalyst-exp-skip.patch

@@ -0,0 +1,88 @@
+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:47 +0800
+Subject: [PATCH] Fix SculkCatalyst exp skip
+
+
+diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
+index 42ffb81708b327f765ba3235fdd1ab69cd7589fd..0a7e37420f8d024ffba1fd1c52edc50c10408e6e 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
++++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
+@@ -25,17 +25,25 @@ public class EntityDeathEvent extends EntityEvent implements org.bukkit.event.Ca
+     private float deathSoundVolume;
+     private float deathSoundPitch;
+     // Paper end
++    private int rewardExp; // Leaves - exp fix
+ 
+     public EntityDeathEvent(@NotNull final LivingEntity entity, @NotNull DamageSource damageSource, @NotNull final List<ItemStack> drops) {
+         this(entity, damageSource, drops, 0);
+     }
+ 
+     public EntityDeathEvent(@NotNull final LivingEntity what, @NotNull DamageSource damageSource, @NotNull final List<ItemStack> drops, final int droppedExp) {
++    // Leaves start - exp fix
++        this(what, damageSource, drops, droppedExp, droppedExp);
++    }
++
++    public EntityDeathEvent(@NotNull final LivingEntity what, @NotNull DamageSource damageSource, @NotNull final List<ItemStack> drops, final int droppedExp, final int rewardExp) {
+         super(what);
+         this.damageSource = damageSource;
+         this.drops = drops;
+         this.dropExp = droppedExp;
++        this.rewardExp = rewardExp;
+     }
++    // Leaves end - exp fix
+ 
+     @NotNull
+     @Override
+@@ -75,6 +83,7 @@ public class EntityDeathEvent extends EntityEvent implements org.bukkit.event.Ca
+      */
+     public void setDroppedExp(int exp) {
+         this.dropExp = exp;
++        this.rewardExp = exp; // Leaves - exp fix
+     }
+ 
+     /**
+@@ -226,4 +235,14 @@ public class EntityDeathEvent extends EntityEvent implements org.bukkit.event.Ca
+         this.deathSoundPitch = pitch;
+     }
+     // Paper end
++
++    // Leaves start - exp fix
++    public int getRewardExp() {
++        return rewardExp;
++    }
++
++    public void setRewardExp(int rewardExp) {
++        this.rewardExp = rewardExp;
++    }
++    // Leaves end - exp fix
+ }
+diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
+index ab7584873e46020148bceecbd42a43055684e6a0..7c99b1c6f5fc8e4ce442d111e7598ddb89d6ee05 100644
+--- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
++++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
+@@ -18,6 +18,7 @@ public class PlayerDeathEvent extends EntityDeathEvent {
+     private boolean keepLevel = false;
+     private boolean keepInventory = false;
+     private boolean doExpDrop; // Paper - shouldDropExperience API
++    private boolean useApiExpDropStatus = false; // Leaves - exp fix
+     // Paper start - adventure
+     @org.jetbrains.annotations.ApiStatus.Internal
+     public PlayerDeathEvent(final @NotNull Player player, final @NotNull DamageSource damageSource, final @NotNull List<ItemStack> drops, final int droppedExp, final @Nullable net.kyori.adventure.text.Component deathMessage) {
+@@ -122,9 +123,16 @@ public class PlayerDeathEvent extends EntityDeathEvent {
+      */
+     public void setShouldDropExperience(boolean doExpDrop) {
+         this.doExpDrop = doExpDrop;
++        this.useApiExpDropStatus = true; // Leaves - exp fix
+     }
+     // Paper end - shouldDropExperience API
+ 
++    // Leaves start - exp fix
++    public boolean forceUseEventDropStatus() {
++        return this.useApiExpDropStatus;
++    }
++    // Leaves end - exp fix
++
+     @NotNull
+     @Override
+     public Player getEntity() {

luminol-server/minecraft-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch

@@ -118,10 +118,10 @@ index f2d2ddfd964bff914e41c0b4150fe1aad7866ebf..7defcd15c44601bfd2f7f55046038693
      }
  
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 423534a1ff02bd0d0f9baacfe2428f45c7d9acb9..9fd3fe181df2ce6dbe695f6463d3940ac4c01167 100644
+index 42987d278bf4abbad9d63485a1050f4abc3e7367..3bc0fc1d411d3c5e206695510ec9288ffbf8c277 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -393,7 +393,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -400,7 +400,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
      public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
      public @Nullable String clientBrandName = null; // Paper - Brand support
      public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
@@ -132,7 +132,7 @@ index 423534a1ff02bd0d0f9baacfe2428f45c7d9acb9..9fd3fe181df2ce6dbe695f6463d3940a
      // Paper start - rewrite chunk system
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
      private final ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder viewDistanceHolder = new ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder();
-@@ -1006,8 +1008,35 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1013,8 +1015,35 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          this.trackEnteredOrExitedLavaOnVehicle();
          this.updatePlayerAttributes();
          this.advancements.flushDirty(this);

luminol-server/minecraft-patches/features/0016-Add-config-for-tripwire-dupe.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
 Date: Mon, 24 Feb 2025 06:00:00 -0800
-Subject: [PATCH] Configurable tripwire dupe
+Subject: [PATCH] Add config for tripwire dupe
 
 
 diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java

luminol-server/minecraft-patches/features/0017-Add-config-to-disable-heightmap-warning.patch

@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 13 Apr 2025 11:07:04 +0800
+Subject: [PATCH] Add config to disable heightmap warning
+
+
+diff --git a/net/minecraft/world/level/levelgen/Heightmap.java b/net/minecraft/world/level/levelgen/Heightmap.java
+index 3b27bcfbbe0529d1526adc30760c846b4011645f..95747ae41cea0d4b577c58ef44959a18e0a46672 100644
+--- a/net/minecraft/world/level/levelgen/Heightmap.java
++++ b/net/minecraft/world/level/levelgen/Heightmap.java
+@@ -123,7 +123,8 @@ public class Heightmap {
+         if (raw.length == data.length) {
+             System.arraycopy(data, 0, raw, 0, data.length);
+         } else {
+-            LOGGER.warn("Ignoring heightmap data for chunk " + chunk.getPos() + ", size does not match; expected: " + raw.length + ", got: " + data.length);
++            if (!me.earthme.luminol.config.modules.misc.DisableHeightmapWarnConfig.enabled)
++                LOGGER.warn("Ignoring heightmap data for chunk " + chunk.getPos() + ", size does not match; expected: " + raw.length + ", got: " + data.length);
+             primeHeightmaps(chunk, EnumSet.of(type));
+         }
+     }

luminol-server/minecraft-patches/features/0018-Add-config-to-revert-raid-changes.patch

@@ -0,0 +1,197 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Fri, 11 Apr 2025 16:53:57 +0800
+Subject: [PATCH] Add config to revert raid changes
+
+
+diff --git a/net/minecraft/world/effect/BadOmenMobEffect.java b/net/minecraft/world/effect/BadOmenMobEffect.java
+index 80f17f33f670018240c854df589cf90cdeab6e70..8672757a4d5fb5c247599782fece6b8d7d6ec921 100644
+--- a/net/minecraft/world/effect/BadOmenMobEffect.java
++++ b/net/minecraft/world/effect/BadOmenMobEffect.java
+@@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect {
+             && !serverPlayer.isSpectator()
+             && level.getDifficulty() != Difficulty.PEACEFUL
+             && level.isVillage(serverPlayer.blockPosition())) {
++            // Leaves start - Revert raid changes
++            if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.trigger) {
++                return level.getRaids().createOrExtendRaid(serverPlayer, serverPlayer.blockPosition()) == null;
++            }
++            // Leaves end - Revert raid changes
+             Raid raidAt = level.getRaidAt(serverPlayer.blockPosition());
+             if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) {
+                 serverPlayer.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplifier));
+diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java
+index 2f45befbb50645f1bfb5961ad725f3670ff0d592..0d91ae860a5c506c634e88341d958618996cc5bc 100644
+--- a/net/minecraft/world/entity/raid/Raid.java
++++ b/net/minecraft/world/entity/raid/Raid.java
+@@ -325,7 +325,20 @@ public class Raid {
+                         }
+ 
+                         if (flag1) {
+-                            this.waveSpawnPos = this.getValidSpawnPos();
++                            // Luminol Start - Raid revert
++                            if (!me.earthme.luminol.config.modules.misc.RaidChangesConfig.pos_revert) {
++                                this.waveSpawnPos = this.getValidSpawnPos();
++                            } else {
++                                int n4 = 0;
++                                if (this.raidCooldownTicks < 100) {
++                                    n4 = 1;
++                                }
++                                if (this.raidCooldownTicks < 40) {
++                                    n4 = 2;
++                                }
++                                this.waveSpawnPos = this.getValidSpawnPos(n4);
++                            }
++                            // Luminol End - Raid revert
+                         }
+ 
+                         if (this.raidCooldownTicks == 300 || this.raidCooldownTicks % 20 == 0) {
+@@ -360,7 +373,14 @@ public class Raid {
+                 int i = 0;
+ 
+                 while (this.shouldSpawnGroup()) {
+-                    BlockPos blockPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(20));
++                    // Luminol Start - Raid revert
++                    BlockPos blockPos;
++                    if (!me.earthme.luminol.config.modules.misc.RaidChangesConfig.pos_revert) {
++                        blockPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(20));
++                    } else {
++                        blockPos = this.waveSpawnPos.isPresent() ? this.waveSpawnPos.get() : this.findRandomSpawnPos(i, 20);
++                    }
++                    // Luminol End - Raid revert
+                     if (blockPos != null) {
+                         this.started = true;
+                         this.spawnGroup(blockPos);
+@@ -372,7 +392,7 @@ public class Raid {
+                         i++;
+                     }
+ 
+-                    if (i > 5) {
++                    if (i > (me.earthme.luminol.config.modules.misc.RaidChangesConfig.pos_revert ? 3 : 5)) { // Luminol - Raid revert
+                         org.bukkit.craftbukkit.event.CraftEventFactory.callRaidStopEvent(this, org.bukkit.event.raid.RaidStopEvent.Reason.UNSPAWNABLE); // CraftBukkit
+                         this.stop();
+                         break;
+@@ -449,6 +469,17 @@ public class Raid {
+         return blockPos != null ? Optional.of(blockPos) : Optional.empty();
+     }
+ 
++    // Luminol Start - Raid revert
++    private Optional<BlockPos> getValidSpawnPos(int n) {
++        for (int i = 0; i < 3; ++i) {
++            BlockPos blockPos = this.findRandomSpawnPos(n, 1);
++            if (blockPos == null) continue;
++            return Optional.of(blockPos);
++        }
++        return Optional.empty();
++    }
++    // Luminol End - Raid revert
++
+     private boolean hasMoreWaves() {
+         return this.hasBonusWave() ? !this.hasSpawnedBonusWave() : !this.isFinalWave();
+     }
+@@ -674,7 +705,7 @@ public class Raid {
+             int i2 = this.center.getX() + Mth.floor(Mth.cos(f2) * 32.0F * f) + this.level.random.nextInt(3) * Mth.floor(f);
+             int i3 = this.center.getZ() + Mth.floor(Mth.sin(f2) * 32.0F * f) + this.level.random.nextInt(3) * Mth.floor(f);
+             int height = this.level.getHeight(Heightmap.Types.WORLD_SURFACE, i2, i3);
+-            if (Mth.abs(height - this.center.getY()) <= 96) {
++            if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.height_check || Mth.abs(height - this.center.getY()) <= 96) { // Leaves - Disable height check
+                 mutableBlockPos.set(i2, height, i3);
+                 if (!this.level.isVillage(mutableBlockPos) || i <= 7) {
+                     int i4 = 10;
+@@ -694,6 +725,26 @@ public class Raid {
+         return null;
+     }
+ 
++    // Luminol Start - Raid revert
++    @Nullable
++    private BlockPos findRandomSpawnPos(int n, int n2) {
++        int n3 = 2 - n;
++        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
++        SpawnPlacementType spawnPlacementType = SpawnPlacements.getPlacementType(EntityType.RAVAGER);
++        for (int i = 0; i < n2; ++i) {
++            float f = this.level.random.nextFloat() * ((float)Math.PI * 2);
++            int n4 = this.center.getX() + Mth.floor(Mth.cos(f) * 32.0f * (float)n3) + this.level.random.nextInt(5);
++            int n5 = this.center.getZ() + Mth.floor(Mth.sin(f) * 32.0f * (float)n3) + this.level.random.nextInt(5);
++            int n6 = this.level.getHeight(Heightmap.Types.WORLD_SURFACE, n4, n5);
++            mutableBlockPos.set(n4, n6, n5);
++            if (this.level.isVillage(mutableBlockPos) && n < 2) continue;
++            if (!this.level.hasChunksAt(mutableBlockPos.getX() - 10, mutableBlockPos.getZ() - 10, mutableBlockPos.getX() + 10, mutableBlockPos.getZ() + 10) || !this.level.isPositionEntityTicking(mutableBlockPos) || !spawnPlacementType.isSpawnPositionOk(this.level, mutableBlockPos, EntityType.RAVAGER) && (!this.level.getBlockState((BlockPos)mutableBlockPos.below()).is(Blocks.SNOW) || !this.level.getBlockState(mutableBlockPos).isAir())) continue;
++            return mutableBlockPos;
++        }
++        return null;
++    }
++    // Luminol End - Raid revert
++
+     private boolean addWaveMob(int wave, Raider raider) {
+         return this.addWaveMob(wave, raider, true);
+     }
+diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
+index 7c385baae81b9a987c0e1e4deb017884600331bc..75a8e0602c249df4b587a454e35f4cd7eab2a25c 100644
+--- a/net/minecraft/world/entity/raid/Raider.java
++++ b/net/minecraft/world/entity/raid/Raider.java
+@@ -125,6 +125,43 @@ public abstract class Raider extends PatrollingMonster {
+ 
+                 currentRaid.removeFromRaid(this, false);
+             }
++
++            // Leaves start - Revert raid changes
++            if (this.level() instanceof ServerLevel serverLevel) {
++                if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.effect && !this.hasRaid()) {
++                    ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
++                    net.minecraft.world.entity.player.Player entityhuman = null;
++                    if (entity instanceof net.minecraft.world.entity.player.Player player) {
++                        entityhuman = player;
++                    } else if (entity instanceof net.minecraft.world.entity.animal.Wolf wolf) {
++                        LivingEntity entityliving = wolf.getOwner();
++                        if (wolf.isTame() && entityliving instanceof net.minecraft.world.entity.player.Player player) {
++                            entityhuman = player;
++                        }
++                    }
++
++                    if (entityhuman != null && !itemstack.isEmpty() && this.isCaptain()) {
++                        net.minecraft.world.effect.MobEffectInstance mobeffect = entityhuman.getEffect(net.minecraft.world.effect.MobEffects.BAD_OMEN);
++                        int i = 1;
++
++                        if (mobeffect != null) {
++                            i += mobeffect.getAmplifier();
++                            entityhuman.removeEffectNoUpdate(net.minecraft.world.effect.MobEffects.BAD_OMEN);
++                            } else {
++                            --i;
++                        }
++
++                        i = net.minecraft.util.Mth.clamp(i, 0, 4);
++                        net.minecraft.world.effect.MobEffectInstance mobeffect1 = new net.minecraft.world.effect.MobEffectInstance(net.minecraft.world.effect.MobEffects.BAD_OMEN, me.earthme.luminol.config.modules.misc.RaidChangesConfig.infinite ? net.minecraft.world.effect.MobEffectInstance.INFINITE_DURATION : 120000, i, false, false, true);
++
++                        if (!serverLevel.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_DISABLE_RAIDS)) {
++                            entityhuman.addEffect(mobeffect1, entityhuman, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN, true, true); // CraftBukkit // Luminol - Raid revert adapt Cross Region Damage trace
++                        }
++                        this.setPatrolLeader(false);
++                    }
++                }
++            }
++            // Leaves end - Revert raid changes
+         }
+ 
+         super.die(cause);
+@@ -153,7 +190,7 @@ public abstract class Raider extends PatrollingMonster {
+     }
+ 
+     public boolean hasRaid() {
+-        return this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null);
++        return !me.earthme.luminol.config.modules.misc.RaidChangesConfig.self_check && (this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null)); // Leaves - Disable raid self check
+     }
+ 
+     public boolean hasActiveRaid() {
+diff --git a/net/minecraft/world/item/component/OminousBottleAmplifier.java b/net/minecraft/world/item/component/OminousBottleAmplifier.java
+index 318f24d67be4daf6993ba547da0540be9c221a75..5607d2f21131510563f8fdc9079d1145483b11df 100644
+--- a/net/minecraft/world/item/component/OminousBottleAmplifier.java
++++ b/net/minecraft/world/item/component/OminousBottleAmplifier.java
+@@ -40,7 +40,7 @@ public record OminousBottleAmplifier(int value) implements ConsumableListener, T
+ 
+     @Override
+     public void addToTooltip(Item.TooltipContext context, Consumer<Component> tooltipAdder, TooltipFlag tooltipFlag) {
+-        List<MobEffectInstance> list = List.of(new MobEffectInstance(MobEffects.BAD_OMEN, 120000, this.value, false, false, true));
++        List<MobEffectInstance> list = List.of(new MobEffectInstance(MobEffects.BAD_OMEN, me.earthme.luminol.config.modules.misc.RaidChangesConfig.infinite ? net.minecraft.world.effect.MobEffectInstance.INFINITE_DURATION : 120000, this.value, false, false, true)); // Luminol - Raid effect infinite
+         PotionContents.addPotionTooltip(list, tooltipAdder, 1.0F, context.tickRate());
+     }
+ }

luminol-server/minecraft-patches/features/0022-Revert-RegionizedTaskQueue-referent-counter-changes.patch

@@ -1,381 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Thu, 20 Mar 2025 23:12:30 +0800
-Subject: [PATCH] Revert RegionizedTaskQueue referent counter changes
-
-
-diff --git a/io/papermc/paper/threadedregions/RegionizedTaskQueue.java b/io/papermc/paper/threadedregions/RegionizedTaskQueue.java
-index 745ab870310733b569681f5280895bb9798620a4..9b8d06c77aa71acbe25151d82777e5dfa4e4a5f7 100644
---- a/io/papermc/paper/threadedregions/RegionizedTaskQueue.java
-+++ b/io/papermc/paper/threadedregions/RegionizedTaskQueue.java
-@@ -24,7 +24,7 @@ public final class RegionizedTaskQueue {
- 
-     public PrioritisedExecutor.PrioritisedTask createChunkTask(final ServerLevel world, final int chunkX, final int chunkZ,
-                                                                final Runnable run) {
--        return this.createChunkTask(world, chunkX, chunkZ, run, Priority.NORMAL);
-+        return new PrioritisedQueue.ChunkBasedPriorityTask(world.taskQueueRegionData, chunkX, chunkZ, true, run, Priority.NORMAL);
-     }
- 
-     public PrioritisedExecutor.PrioritisedTask createChunkTask(final ServerLevel world, final int chunkX, final int chunkZ,
-@@ -34,7 +34,7 @@ public final class RegionizedTaskQueue {
- 
-     public PrioritisedExecutor.PrioritisedTask createTickTaskQueue(final ServerLevel world, final int chunkX, final int chunkZ,
-                                                                    final Runnable run) {
--        return this.createTickTaskQueue(world, chunkX, chunkZ, run, Priority.NORMAL);
-+        return new PrioritisedQueue.ChunkBasedPriorityTask(world.taskQueueRegionData, chunkX, chunkZ, false, run, Priority.NORMAL);
-     }
- 
-     public PrioritisedExecutor.PrioritisedTask createTickTaskQueue(final ServerLevel world, final int chunkX, final int chunkZ,
-@@ -73,7 +73,7 @@ public final class RegionizedTaskQueue {
-     public static final class WorldRegionTaskData {
-         private final ServerLevel world;
-         private final MultiThreadedQueue<Runnable> globalChunkTask = new MultiThreadedQueue<>();
--        private final ConcurrentLong2ReferenceChainedHashTable<ReferenceCountData> referenceCounters = new ConcurrentLong2ReferenceChainedHashTable<>();
-+        private final ConcurrentLong2ReferenceChainedHashTable<AtomicLong> referenceCounters = new ConcurrentLong2ReferenceChainedHashTable<>();
- 
-         public WorldRegionTaskData(final ServerLevel world) {
-             this.world = world;
-@@ -99,7 +99,7 @@ public final class RegionizedTaskQueue {
-         private PrioritisedQueue getQueue(final boolean synchronise, final int chunkX, final int chunkZ, final boolean isChunkTask) {
-             final ThreadedRegionizer<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> regioniser = this.world.regioniser;
-             final ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> region
--                = synchronise ? regioniser.getRegionAtSynchronised(chunkX, chunkZ) : regioniser.getRegionAtUnsynchronised(chunkX, chunkZ);
-+                    = synchronise ? regioniser.getRegionAtSynchronised(chunkX, chunkZ) : regioniser.getRegionAtUnsynchronised(chunkX, chunkZ);
-             if (region == null) {
-                 return null;
-             }
-@@ -109,13 +109,13 @@ public final class RegionizedTaskQueue {
- 
-         private void removeTicket(final long coord) {
-             this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.removeTicketAtLevel(
--                TASK_QUEUE_TICKET, coord, ChunkHolderManager.MAX_TICKET_LEVEL, Unit.INSTANCE
-+                    TASK_QUEUE_TICKET, coord, ChunkHolderManager.MAX_TICKET_LEVEL, Unit.INSTANCE
-             );
-         }
- 
-         private void addTicket(final long coord) {
-             this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.addTicketAtLevel(
--                TASK_QUEUE_TICKET, coord, ChunkHolderManager.MAX_TICKET_LEVEL, Unit.INSTANCE
-+                    TASK_QUEUE_TICKET, coord, ChunkHolderManager.MAX_TICKET_LEVEL, Unit.INSTANCE
-             );
-         }
- 
-@@ -123,95 +123,96 @@ public final class RegionizedTaskQueue {
-             this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.processTicketUpdates(CoordinateUtils.getChunkX(coord), CoordinateUtils.getChunkZ(coord));
-         }
- 
--        // note: only call on acquired referenceCountData
--        private void ensureTicketAdded(final long coord, final ReferenceCountData referenceCountData) {
--            if (!referenceCountData.addedTicket) {
--                // fine if multiple threads do this, no removeTicket may be called for this coord due to reference count inc
--                this.addTicket(coord);
--                this.processTicketUpdates(coord);
--                referenceCountData.addedTicket = true;
-+        private void decrementReference(final AtomicLong reference, final long coord) {
-+            final long val = reference.decrementAndGet();
-+            if (val == 0L) {
-+                final int chunkX = CoordinateUtils.getChunkX(coord);
-+                final int chunkZ = CoordinateUtils.getChunkZ(coord);
-+                final ca.spottedleaf.concurrentutil.lock.ReentrantAreaLock.Node ticketLock = this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.ticketLockArea.lock(chunkX, chunkZ);
-+                try {
-+                    if (this.referenceCounters.remove(coord, reference) == reference) {
-+                        WorldRegionTaskData.this.removeTicket(coord);
-+                    } // else: race condition, something replaced our reference - not our issue anymore
-+                } finally {
-+                    this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.ticketLockArea.unlock(ticketLock);
-+                }
-+            } else if (val < 0L) {
-+                throw new IllegalStateException("Reference count < 0: " + val);
-             }
-         }
- 
--        private void decrementReference(final ReferenceCountData referenceCountData, final long coord) {
--            if (!referenceCountData.decreaseReferenceCount()) {
--                return;
--            } // else: need to remove ticket
--
--            // note: it is possible that another thread increments and then removes the reference before we can, so
--            //       use ifPresent
--            this.referenceCounters.computeIfPresent(coord, (final long keyInMap, final ReferenceCountData valueInMap) -> {
--                if (valueInMap.referenceCount.get() != 0L) {
--                    return valueInMap;
--                }
--
--                // note: valueInMap may not be referenceCountData
--
--                // possible to invoke this outside of the compute call, but not required and requires additional logic
--                WorldRegionTaskData.this.removeTicket(keyInMap);
-+        private AtomicLong incrementReference(final long coord) {
-+            final AtomicLong ret = this.referenceCounters.get(coord);
-+            if (ret != null) {
-+                // try to fast acquire counter
-+                int failures = 0;
-+                for (long curr = ret.get();;) {
-+                    if (curr == 0L) {
-+                        // failed to fast acquire as reference expired
-+                        break;
-+                    }
- 
--                return null;
--            });
--        }
-+                    for (int i = 0; i < failures; ++i) {
-+                        ConcurrentUtil.backoff();
-+                    }
- 
--        private ReferenceCountData incrementReference(final long coord) {
--            ReferenceCountData referenceCountData = this.referenceCounters.get(coord);
-+                    if (curr == (curr = ret.compareAndExchange(curr, curr + 1L))) {
-+                        return ret;
-+                    }
- 
--            if (referenceCountData != null && referenceCountData.addCount()) {
--                this.ensureTicketAdded(coord, referenceCountData);
--                return referenceCountData;
-+                    ++failures;
-+                }
-             }
- 
--            referenceCountData = this.referenceCounters.compute(coord, (final long keyInMap, final ReferenceCountData valueInMap) -> {
-+            // slow acquire
-+            final int chunkX = CoordinateUtils.getChunkX(coord);
-+            final int chunkZ = CoordinateUtils.getChunkZ(coord);
-+            final ca.spottedleaf.concurrentutil.lock.ReentrantAreaLock.Node ticketLock = this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.ticketLockArea.lock(chunkX, chunkZ);
-+            final AtomicLong ret2;
-+            final boolean processTicketUpdates;
-+            try {
-+                final AtomicLong replace = new AtomicLong(1L);
-+                final AtomicLong valueInMap = this.referenceCounters.putIfAbsent(coord, replace);
-                 if (valueInMap == null) {
--                    // sets reference count to 1
--                    return new ReferenceCountData();
--                }
--                // OK if we add from 0, the remove call will use compute() and catch this race condition
--                valueInMap.referenceCount.getAndIncrement();
--
--                return valueInMap;
--            });
--
--            this.ensureTicketAdded(coord, referenceCountData);
--
--            return referenceCountData;
--        }
--    }
--
--    private static final class ReferenceCountData {
--
--        public final AtomicLong referenceCount = new AtomicLong(1L);
--        public volatile boolean addedTicket;
-+                    // replaced, we should usually be here
-+                    this.addTicket(coord);
-+                    ret2 = replace;
-+                    processTicketUpdates = true;
-+                } else {
-+                    processTicketUpdates = false;
-+                    int failures = 0;
-+                    for (long curr = valueInMap.get();;) {
-+                        if (curr == 0L) {
-+                            // don't need to add ticket here, since ticket is only removed during the lock
-+                            // we just need to replace the value in the map so that the thread removing fails and doesn't
-+                            // remove the ticket (see decrementReference)
-+                            this.referenceCounters.put(coord, replace);
-+                            ret2 = replace;
-+                            break;
-+                        }
- 
--        // returns false if reference count is 0, otherwise increments ref count
--        public boolean addCount() {
--            int failures = 0;
--            for (long curr = this.referenceCount.get();;) {
--                for (int i = 0; i < failures; ++i) {
--                    Thread.onSpinWait();
--                }
-+                        for (int i = 0; i < failures; ++i) {
-+                            ConcurrentUtil.backoff();
-+                        }
- 
--                if (curr == 0L) {
--                    return false;
--                }
-+                        if (curr == (curr = valueInMap.compareAndExchange(curr, curr + 1L))) {
-+                            // acquired
-+                            ret2 = valueInMap;
-+                            break;
-+                        }
- 
--                if (curr == (curr = this.referenceCount.compareAndExchange(curr, curr + 1L))) {
--                    return true;
-+                        ++failures;
-+                    }
-                 }
--
--                ++failures;
-+            } finally {
-+                this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.ticketLockArea.unlock(ticketLock);
-             }
--        }
- 
--        // returns true if new reference count is 0
--        public boolean decreaseReferenceCount() {
--            final long res = this.referenceCount.decrementAndGet();
--            if (res >= 0L) {
--                return res == 0L;
--            } else {
--                throw new IllegalStateException("Negative reference count");
-+            if (processTicketUpdates) {
-+                this.processTicketUpdates(coord);
-             }
-+
-+            return ret2;
-         }
-     }
- 
-@@ -240,10 +241,10 @@ public final class RegionizedTaskQueue {
-         void split(final ThreadedRegionizer<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> regioniser,
-                    final Long2ReferenceOpenHashMap<ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>> into) {
-             this.tickTaskQueue.split(
--                false, regioniser, into
-+                    false, regioniser, into
-             );
-             this.chunkQueue.split(
--                true, regioniser, into
-+                    true, regioniser, into
-             );
-         }
- 
-@@ -340,7 +341,7 @@ public final class RegionizedTaskQueue {
-                           final ThreadedRegionizer<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> regioniser,
-                           final Long2ReferenceOpenHashMap<ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>> into) {
-             final Reference2ReferenceOpenHashMap<ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>, ArrayDeque<ChunkBasedPriorityTask>[]>
--                split = new Reference2ReferenceOpenHashMap<>();
-+                    split = new Reference2ReferenceOpenHashMap<>();
-             final int shift = regioniser.sectionChunkShift;
-             synchronized (this) {
-                 this.isDestroyed = true;
-@@ -356,7 +357,7 @@ public final class RegionizedTaskQueue {
-                         final int sectionZ = task.chunkZ >> shift;
-                         final long sectionKey = CoordinateUtils.getChunkKey(sectionX, sectionZ);
-                         final ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>
--                            region = into.get(sectionKey);
-+                                region = into.get(sectionKey);
-                         if (region == null) {
-                             throw new IllegalStateException();
-                         }
-@@ -378,7 +379,7 @@ public final class RegionizedTaskQueue {
-                      iterator = split.reference2ReferenceEntrySet().fastIterator();
-                      iterator.hasNext();) {
-                     final Reference2ReferenceMap.Entry<ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>, ArrayDeque<ChunkBasedPriorityTask>[]>
--                        entry = iterator.next();
-+                            entry = iterator.next();
-                     final RegionTaskQueueData taskQueueData = entry.getKey().getData().getTaskQueueData();
-                     mergeInto(isChunkData ? taskQueueData.chunkQueue : taskQueueData.tickTaskQueue, entry.getValue());
-                 }
-@@ -408,7 +409,7 @@ public final class RegionizedTaskQueue {
-             final ArrayDeque<ChunkBasedPriorityTask>[] queues = this.queues;
-             final int max = Priority.IDLE.priority;
-             ChunkBasedPriorityTask task = null;
--            ReferenceCountData referenceCounter = null;
-+            AtomicLong referenceCounter = null;
-             synchronized (this) {
-                 if (this.isDestroyed) {
-                     throw new IllegalStateException("Attempting to poll from dead queue");
-@@ -440,10 +441,9 @@ public final class RegionizedTaskQueue {
- 
-         private static final class ChunkBasedPriorityTask implements PrioritisedExecutor.PrioritisedTask {
- 
--            private static final ReferenceCountData REFERENCE_COUNTER_NOT_SET = new ReferenceCountData();
--            static {
--                REFERENCE_COUNTER_NOT_SET.referenceCount.set((long)Integer.MIN_VALUE);
--            }
-+            private static final AtomicLong REFERENCE_COUNTER_NOT_SET = new AtomicLong(-1L);
-+
-+
- 
-             private final WorldRegionTaskData world;
-             private final int chunkX;
-@@ -451,8 +451,8 @@ public final class RegionizedTaskQueue {
-             private final long sectionLowerLeftCoord; // chunk coordinate
-             private final boolean isChunkTask;
- 
--            private volatile ReferenceCountData referenceCounter;
--            private static final VarHandle REFERENCE_COUNTER_HANDLE = ConcurrentUtil.getVarHandle(ChunkBasedPriorityTask.class, "referenceCounter", ReferenceCountData.class);
-+            private volatile AtomicLong referenceCounter;
-+            private static final VarHandle REFERENCE_COUNTER_HANDLE = ConcurrentUtil.getVarHandle(ChunkBasedPriorityTask.class, "referenceCounter", AtomicLong.class);
-             private Runnable run;
-             private volatile Priority priority;
-             private static final VarHandle PRIORITY_HANDLE = ConcurrentUtil.getVarHandle(ChunkBasedPriorityTask.class, "priority", Priority.class);
-@@ -489,16 +489,16 @@ public final class RegionizedTaskQueue {
-                 return (Priority)PRIORITY_HANDLE.compareAndExchange(this, expect, update);
-             }
- 
--            private void setReferenceCounterPlain(final ReferenceCountData value) {
-+            private void setReferenceCounterPlain(final AtomicLong value) {
-                 REFERENCE_COUNTER_HANDLE.set(this, value);
-             }
- 
--            private ReferenceCountData getReferenceCounterVolatile() {
--                return (ReferenceCountData)REFERENCE_COUNTER_HANDLE.get(this);
-+            private AtomicLong getReferenceCounterVolatile() {
-+                return (AtomicLong)REFERENCE_COUNTER_HANDLE.get(this);
-             }
- 
--            private ReferenceCountData compareAndExchangeReferenceCounter(final ReferenceCountData expect, final ReferenceCountData update) {
--                return (ReferenceCountData)REFERENCE_COUNTER_HANDLE.compareAndExchange(this, expect, update);
-+            private AtomicLong compareAndExchangeReferenceCounter(final AtomicLong expect, final AtomicLong update) {
-+                return (AtomicLong)REFERENCE_COUNTER_HANDLE.compareAndExchange(this, expect, update);
-             }
- 
-             private void executeInternal() {
-@@ -515,7 +515,7 @@ public final class RegionizedTaskQueue {
- 
-             private boolean tryComplete(final boolean cancel) {
-                 int failures = 0;
--                for (ReferenceCountData curr = this.getReferenceCounterVolatile();;) {
-+                for (AtomicLong curr = this.getReferenceCounterVolatile();;) {
-                     if (curr == null) {
-                         return false;
-                     }
-@@ -564,7 +564,7 @@ public final class RegionizedTaskQueue {
-                     return false;
-                 }
- 
--                final ReferenceCountData referenceCounter = this.world.incrementReference(this.sectionLowerLeftCoord);
-+                final AtomicLong referenceCounter = this.world.incrementReference(this.sectionLowerLeftCoord);
-                 if (this.compareAndExchangeReferenceCounter(REFERENCE_COUNTER_NOT_SET, referenceCounter) != REFERENCE_COUNTER_NOT_SET) {
-                     // we don't expect race conditions here, so it is OK if we have to needlessly reference count
-                     this.world.decrementReference(referenceCounter, this.sectionLowerLeftCoord);
-@@ -614,7 +614,7 @@ public final class RegionizedTaskQueue {
-                 }
-             }
- 
--            private ReferenceCountData trySetCompleting(final int minPriority) {
-+            private AtomicLong trySetCompleting(final int minPriority) {
-                 // first, try to set priority to EXECUTING
-                 for (Priority curr = this.getPriorityVolatile();;) {
-                     if (curr.isLowerPriority(minPriority)) {
-@@ -626,7 +626,7 @@ public final class RegionizedTaskQueue {
-                     } // else: continue
-                 }
- 
--                for (ReferenceCountData curr = this.getReferenceCounterVolatile();;) {
-+                for (AtomicLong curr = this.getReferenceCounterVolatile();;) {
-                     if (curr == null) {
-                         // something acquired before us
-                         return null;
-@@ -639,7 +639,6 @@ public final class RegionizedTaskQueue {
-                     if (curr != (curr = this.compareAndExchangeReferenceCounter(curr, null))) {
-                         continue;
-                     }
--
-                     return curr;
-                 }
-             }
-@@ -647,7 +646,7 @@ public final class RegionizedTaskQueue {
-             private void updatePriorityInQueue() {
-                 boolean synchronise = false;
-                 for (;;) {
--                    final ReferenceCountData referenceCount = this.getReferenceCounterVolatile();
-+                    final AtomicLong referenceCount = this.getReferenceCounterVolatile();
-                     if (referenceCount == REFERENCE_COUNTER_NOT_SET || referenceCount == null) {
-                         // cancelled or not queued
-                         return;

luminol-server/minecraft-patches/features/0023-Fix-uncorrected-death-check-of-folia.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix uncorrected death check of folia
 
 
 diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 50af953a4698a3c6e16b840fab764dd733b3fbc9..a9c058238819f3631d94ac306185e909821caf35 100644
+index acca8c51d2030c675c157b10d0bbc6af631afe61..d0b688e69979c5e7b8267ac96bd71bcd33444c41 100644
 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -679,7 +679,7 @@ public abstract class AbstractContainerMenu {
+@@ -689,7 +689,7 @@ public abstract class AbstractContainerMenu {
      }
  
      private static void dropOrPlaceInInventory(Player player, ItemStack stack) {

luminol-server/minecraft-patches/features/0026-Correct-player-respawn-place.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sat, 26 Apr 2025 21:47:45 +0800
+Subject: [PATCH] Correct player respawn place
+
+
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index 3bc0fc1d411d3c5e206695510ec9288ffbf8c277..b6df8df78105e08ca7be82524685d8b9422abf21 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -472,8 +472,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         double amountX = selectMaxX - selectMinX;
+         double amountZ = selectMaxZ - selectMinZ;
+ 
+-        int selectX = amountX < 1.0 ? Mth.floor(worldBorder.getCenterX()) : (int)Mth.floor((amountX + 1.0) * random.nextDouble() + selectMinX);
+-        int selectZ = amountZ < 1.0 ? Mth.floor(worldBorder.getCenterZ()) : (int)Mth.floor((amountZ + 1.0) * random.nextDouble() + selectMinZ);
++        // Luminol start - Correct player respawn place
++        int selectX = amountX < 0.0 ? Mth.floor(worldBorder.getCenterX()) : (int)Mth.floor(amountX * random.nextDouble() + selectMinX);
++        int selectZ = amountZ < 0.0 ? Mth.floor(worldBorder.getCenterZ()) : (int)Mth.floor(amountZ * random.nextDouble() + selectMinZ);
++        // Luminol end - Correct player respawn place
+ 
+         return new BlockPos(selectX, 0, selectZ);
+     }
+@@ -484,10 +486,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+     }
+ 
+     private static BlockPos findSpawnAround(ServerLevel world, ServerPlayer player, BlockPos selected) {
++        // Luminol start - Correct player respawn place
++        BlockPos inChunk;
++        inChunk = PlayerRespawnLogic.getOverworldRespawnPos(world, selected.getX(), selected.getZ());
++        if (inChunk != null) {
++            AABB checkVolume = player.getBoundingBoxAt((double)inChunk.getX() + 0.5, (double)inChunk.getY(), (double)inChunk.getZ() + 0.5);
++            if (player.noCollisionNoLiquid(world, checkVolume)) {
++                return inChunk;
++            }
++        }
++        // Luminol end - Correct player respawn place
+         // try hard to find, so that we don't attempt another chunk load
+         for (int dz = -SPAWN_RADIUS_SELECTION_SEARCH; dz <= SPAWN_RADIUS_SELECTION_SEARCH; ++dz) {
+             for (int dx = -SPAWN_RADIUS_SELECTION_SEARCH; dx <= SPAWN_RADIUS_SELECTION_SEARCH; ++dx) {
+-                BlockPos inChunk = PlayerRespawnLogic.getOverworldRespawnPos(world, selected.getX() + dx, selected.getZ() + dz);
++                inChunk = PlayerRespawnLogic.getOverworldRespawnPos(world, selected.getX() + dx, selected.getZ() + dz); // Luminol - Correct player respawn place
+                 if (inChunk == null) {
+                     continue;
+                 }

luminol-server/minecraft-patches/features/0027-Command-IllegalArgumentException-crash-fix.patch

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Thu, 24 Apr 2025 20:59:52 +0800
+Subject: [PATCH] Command IllegalArgumentException crash fix
+
+
+diff --git a/net/minecraft/server/commands/FillCommand.java b/net/minecraft/server/commands/FillCommand.java
+index 89154adfc659afa188cd771e70087e3b1a9c98b9..e622f96e6e116bf491bbea39da099e02ceaee502 100644
+--- a/net/minecraft/server/commands/FillCommand.java
++++ b/net/minecraft/server/commands/FillCommand.java
+@@ -210,6 +210,10 @@ public class FillCommand {
+             // Folia start - region threading
+                 } catch (CommandSyntaxException ex) {
+                     sendMessage(source, ex);
++                // Luminol Start - Server crash fix
++                } catch (IllegalArgumentException ex) {
++                    net.minecraft.server.commands.SetBlockCommand.processIAE(source, ex);
++                // Luminol End - Server crash fix
+                 }
+             }); return 0; // Folia end - region threading
+         }
+diff --git a/net/minecraft/server/commands/SetBlockCommand.java b/net/minecraft/server/commands/SetBlockCommand.java
+index 05b824409546ba8bacf7efdaeac106af89ff0715..55911d49c7650b344b46b2cfa9c4ae840ae433c8 100644
+--- a/net/minecraft/server/commands/SetBlockCommand.java
++++ b/net/minecraft/server/commands/SetBlockCommand.java
+@@ -86,6 +86,15 @@ public class SetBlockCommand {
+     }
+     // Folia end - region threading
+ 
++    // Luminol Start - Server crash fix
++    public static void processIAE(CommandSourceStack src, IllegalArgumentException ex) {
++        Component hoverText = Component.translatable("command.failed")
++                .withStyle(style -> style.withHoverEvent(new net.minecraft.network.chat.HoverEvent(net.minecraft.network.chat.HoverEvent.Action.SHOW_TEXT, Component.literal(ex.getMessage()))));
++        src.sendFailure(hoverText);
++        com.mojang.logging.LogUtils.getLogger().error(ex.getMessage(), ex);
++    }
++    // Luminol end - Server crash fix
++
+     private static int setBlock(
+         CommandSourceStack source, BlockPos pos, BlockInput state, SetBlockCommand.Mode mode, @Nullable Predicate<BlockInWorld> predicate
+     ) throws CommandSyntaxException {
+@@ -119,6 +128,10 @@ public class SetBlockCommand {
+         // Folia start - region threading
+                 } catch (CommandSyntaxException ex) {
+                     sendMessage(source, ex);
++                // Luminol Start - Server crash fix
++                } catch (IllegalArgumentException ex) {
++                    processIAE(source, ex);
++                // Luminol End - Server crash fix
+                 }
+             });
+         return 1;

luminol-server/minecraft-patches/features/0028-Fix-incorrectly-synced-data-after-player-teleportati.patch

@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Fri, 2 May 2025 12:03:14 +0800
+Subject: [PATCH] Fix incorrectly synced data after player teleportation
+
+
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index b6df8df78105e08ca7be82524685d8b9422abf21..10e3a54f3e7aa02a5c9986d3694c02bef07a66bf 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -1812,14 +1812,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+             this.connection.send(new ClientboundChangeDifficultyPacket(
+                 worlddata.getDifficulty(), worlddata.isDifficultyLocked()
+             ));
+-            this.connection.send(new ClientboundSetExperiencePacket(
++            /*this.connection.send(new ClientboundSetExperiencePacket( // Luminol start - teleportAsync tweaks, will send in next tick, see the changes below
+                 this.experienceProgress, this.totalExperience, this.experienceLevel
+-            ));
++            ));*/ // Luminol end
+ 
+             playerlist.sendActivePlayerEffects(this);
+             playerlist.sendLevelInfo(this, destination);
+             playerlist.sendPlayerPermissionLevel(this);
+ 
++            // Luminol start - teleportAsync tweaks
++            this.lastSentExp = -1;
++            this.lastSentHealth = -1.0F;
++            this.lastSentFood = -1;
++            // Luminol end
++
+             // regular world add logic
+             this.unsetRemoved();
+             destination.addDuringTeleport(this);

luminol-server/minecraft-patches/features/0032-Purpur-Use-alternative-keep-alive.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur Use alternative keep alive
 
 
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 6eca15223b92aedac74233db886e2c1248750e2c..7507f32b5f0f7fbbf35eeaaf03bf9d99694c1683 100644
+index 79fe336adf35f4f007461ed050e6301764fe7fc3..a5b805b98cf138eabfb06f4ff202462be60c2995 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -41,6 +41,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -33,7 +33,7 @@ index 6eca15223b92aedac74233db886e2c1248750e2c..7507f32b5f0f7fbbf35eeaaf03bf9d99
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int)(Util.getMillis() - this.keepAliveTime);
              this.latency = (this.latency * 3 + i) / 4;
-@@ -250,7 +261,22 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -254,7 +265,22 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          // Paper start - give clients a longer time to respond to pings as per pre 1.12.2 timings
          // This should effectively place the keepalive handling back to "as it was" before 1.12.2
          final long elapsedTime = millis - this.keepAliveTime;
@@ -57,7 +57,7 @@ index 6eca15223b92aedac74233db886e2c1248750e2c..7507f32b5f0f7fbbf35eeaaf03bf9d99
              if (this.keepAlivePending) {
                  if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                      this.disconnect(TIMEOUT_DISCONNECTION_MESSAGE, org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
-@@ -263,6 +289,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -267,6 +293,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                  this.send(new ClientboundKeepAlivePacket(this.keepAliveChallenge));
              }
          }

luminol-server/minecraft-patches/features/0034-Purpur-Barrels-and-enderchests-6-rows.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur-Barrels-and-enderchests-6-rows
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 9bf6e8240bf15f08b037b18cfeae15ebb8ea934d..79e7fcb7949fbc8e3794d481e41d5164dea0b273 100644
+index 751b011701d6ae373099226ea63ffbafcd24ce6a..e5e946462da9e56344428139768075b7bd228ec0 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -1103,6 +1103,10 @@ public abstract class PlayerList {
@@ -20,7 +20,7 @@ index 9bf6e8240bf15f08b037b18cfeae15ebb8ea934d..79e7fcb7949fbc8e3794d481e41d5164
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index ad34d0e1ab16fb269b3cec2842bfc2f2c29b452e..40b91234fd2e4f4f134d309590ea6b605f764e83 100644
+index ae049c5c3593525b991d865fec695c00ad408a59..c6252a245e9701f69db1fe167f6590095237553a 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
 @@ -200,6 +200,7 @@ public abstract class Player extends LivingEntity {

luminol-server/minecraft-patches/features/0044-Leaves-Revert-raid-changes.patch

@@ -1,70 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Suisuroru <qwertyuiop14077@qq.com>
-Date: Thu, 20 Feb 2025 23:56:44 +0800
-Subject: [PATCH] Leaves-Revert-raid-changes
-
-
-diff --git a/net/minecraft/world/effect/BadOmenMobEffect.java b/net/minecraft/world/effect/BadOmenMobEffect.java
-index 80f17f33f670018240c854df589cf90cdeab6e70..7976b9ae6688b9a07b2ad19d1af3670fe06a0b63 100644
---- a/net/minecraft/world/effect/BadOmenMobEffect.java
-+++ b/net/minecraft/world/effect/BadOmenMobEffect.java
-@@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect {
-             && !serverPlayer.isSpectator()
-             && level.getDifficulty() != Difficulty.PEACEFUL
-             && level.isVillage(serverPlayer.blockPosition())) {
-+            // Leaves start - Revert raid changes
-+            if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.trigger) {
-+                return level.getRaids().createOrExtendRaid(serverPlayer, serverPlayer.blockPosition()) != null;
-+            }
-+            // Leaves end - Revert raid changes
-             Raid raidAt = level.getRaidAt(serverPlayer.blockPosition());
-             if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) {
-                 serverPlayer.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplifier));
-diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index 7c385baae81b9a987c0e1e4deb017884600331bc..c2afe945d6a9780ba5f8ac5d6f0b4b2d692fdd51 100644
---- a/net/minecraft/world/entity/raid/Raider.java
-+++ b/net/minecraft/world/entity/raid/Raider.java
-@@ -125,6 +125,43 @@ public abstract class Raider extends PatrollingMonster {
- 
-                 currentRaid.removeFromRaid(this, false);
-             }
-+
-+            // Leaves start - Revert raid changes
-+            if (this.level() instanceof ServerLevel serverLevel) {
-+                if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.effect && raid == null && serverLevel.getRaidAt(this.blockPosition()) == null) {
-+                    ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
-+                    net.minecraft.world.entity.player.Player entityhuman = null;
-+                    if (entity instanceof net.minecraft.world.entity.player.Player player) {
-+                        entityhuman = player;
-+                    } else if (entity instanceof net.minecraft.world.entity.animal.Wolf wolf) {
-+                            LivingEntity entityliving = wolf.getOwner();
-+                            if (wolf.isTame() && entityliving instanceof net.minecraft.world.entity.player.Player player) {
-+                                entityhuman = player;
-+                            }
-+                    }
-+
-+                    if (entityhuman != null && !itemstack.isEmpty() && this.isCaptain()) {
-+                        net.minecraft.world.effect.MobEffectInstance mobeffect = entityhuman.getEffect(net.minecraft.world.effect.MobEffects.BAD_OMEN);
-+                        int i = 1;
-+
-+                        if (mobeffect != null) {
-+                            i += mobeffect.getAmplifier();
-+                            entityhuman.removeEffectNoUpdate(net.minecraft.world.effect.MobEffects.BAD_OMEN);
-+                            } else {
-+                            --i;
-+                        }
-+
-+                        i = net.minecraft.util.Mth.clamp(i, 0, 4);
-+                        net.minecraft.world.effect.MobEffectInstance mobeffect1 = new net.minecraft.world.effect.MobEffectInstance(net.minecraft.world.effect.MobEffects.BAD_OMEN, 120000, i, false, false, true);
-+
-+                        if (!serverLevel.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_DISABLE_RAIDS)) {
-+                            entityhuman.addEffect(mobeffect1, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN); // CraftBukkit
-+                        }
-+                        this.setPatrolLeader(false);
-+                    }
-+                }
-+            }
-+            // Leaves end - Revert raid changes
-         }
- 
-         super.die(cause);

luminol-server/minecraft-patches/features/0046-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Leaf Remove useless creating stats json bases on player name
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 548f7a2b0b020ff7fff27396942cc0bc9e755afe..9bf6e8240bf15f08b037b18cfeae15ebb8ea934d 100644
+index e5e946462da9e56344428139768075b7bd228ec0..9777a5b7ba9916e426ba87d6ee7cd56f0e43c195 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1411,6 +1411,8 @@ public abstract class PlayerList {
+@@ -1420,6 +1420,8 @@ public abstract class PlayerList {
          if (serverStatsCounter == null) {
              File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile();
              File file1 = new File(file, uuid + ".json");
@@ -18,7 +18,7 @@ index 548f7a2b0b020ff7fff27396942cc0bc9e755afe..9bf6e8240bf15f08b037b18cfeae15eb
              if (!file1.exists()) {
                  File file2 = new File(file, displayName + ".json"); // CraftBukkit
                  Path path = file2.toPath();
-@@ -1418,6 +1420,8 @@ public abstract class PlayerList {
+@@ -1427,6 +1429,8 @@ public abstract class PlayerList {
                      file2.renameTo(file1);
                  }
              }

luminol-server/minecraft-patches/features/0050-Add-missing-teleportation-apis-for-folia.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add missing teleportation apis for folia
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 9fd3fe181df2ce6dbe695f6463d3940ac4c01167..822d401150d3764004b2570da828b4f69f19dcec 100644
+index 10e3a54f3e7aa02a5c9986d3694c02bef07a66bf..ca67950e35c7f420846337e885d95b8eabca3f37 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1653,6 +1653,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1673,6 +1673,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                      if (respawnComplete != null) {
                          respawnComplete.accept(ServerPlayer.this);
                      }

luminol-server/minecraft-patches/features/0051-Fix-off-tickregion-sync-teleport.patch

@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Thu, 24 Apr 2025 23:11:13 +0800
+Subject: [PATCH] Fix off tickregion sync teleport
+
+
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index ccf1914b4f48ecc0f4fe980510f42d5415ec1daa..2ea6160492cb23e96271dfbfd3bd35fe03109d6a 100644
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
+@@ -4067,6 +4067,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+         this.resetStoredPositions();
+     }
+ 
++    // Luminol start - Fix sync teleport issue
++    private boolean checkNearbyTickRegions(int destX, int destZ) {
++        // Dumb end gateway search the chunks in radius of 5 chunks, so we need keep 6(5+1) by default check radius
++        int sizeBx = Math.min(6, (int) (this.bb.maxX - this.bb.minX) + this.level.getCraftServer().getSimulationDistance());
++        int sizeBz = Math.min(6, (int) (this.bb.maxZ - this.bb.minZ) + this.level.getCraftServer().getSimulationDistance());
++
++        // check tick thread around these area
++        return ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.level,
++                (destX >> 4) - sizeBx,
++                (destZ >> 4) - sizeBz,
++                (destX >> 4) + sizeBx,
++                (destZ >> 4) + sizeBz);
++    }
++    // Luminol end
++
+     protected final void transform(TeleportTransition telpeort) {
+         PositionMoveRotation move = PositionMoveRotation.calculateAbsolute(
+             PositionMoveRotation.of(this), PositionMoveRotation.of(telpeort), telpeort.relatives()
+@@ -4189,7 +4204,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+         // check for same region
+         if (destination == this.level()) {
+             Vec3 currPos = this.position();
+-            if (
++            // Luminol - Prevent entity sync teleported to the edge of tickregion
++            if (this.checkNearbyTickRegions((int) pos.x, (int) pos.z) && // Luminol - Fix sync teleport issue
+                 destination.regioniser.getRegionAtUnsynchronised(
+                     ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(currPos), ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(currPos)
+                 ) == destination.regioniser.getRegionAtUnsynchronised(

luminol-server/minecraft-patches/features/0052-Portal-Behavior-Modifiers.patch

@@ -0,0 +1,127 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 27 Apr 2025 14:26:01 +0800
+Subject: [PATCH] Portal Behavior Modifiers
+
+
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 2ea6160492cb23e96271dfbfd3bd35fe03109d6a..2871980e53a66bdacf7c00e7045ad01d68a972d3 100644
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
+@@ -3304,7 +3304,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+             this.setPortalCooldown();
+         } else {
+             if (this.portalProcess == null || !this.portalProcess.isSamePortal(portal)) {
+-                this.portalProcess = new PortalProcessor(portal, pos.immutable());
++                this.portalProcess = new PortalProcessor(portal, pos.immutable(), this.getDeltaMovement()); // Luminol - Entity portal-teleport speed fix
+             } else if (!this.portalProcess.isInsidePortalThisTick()) {
+                 this.portalProcess.updateEntryPosition(pos.immutable());
+                 this.portalProcess.setAsInsidePortalThisTick(true);
+@@ -3829,20 +3829,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
+             EntityTreeNode curr;
+             while ((curr = queue.pollFirst()) != null) {
+-                EntityTreeNode[] passengers = curr.passengers;
++                restore(curr); // Luminol - EndGateway Portal Passengers Fix
++            }
++        }
++
++        // Luminol Start - EndGateway Portal Passengers Fix
++        private EntityTreeNode[] restore(EntityTreeNode entity) {
++                EntityTreeNode[] passengers = entity.passengers;
+                 if (passengers == null) {
+-                    continue;
++                    return null;
+                 }
+ 
+                 List<Entity> newPassengers = new java.util.ArrayList<>();
+                 for (EntityTreeNode passenger : passengers) {
++                    passenger.passengers = restore(passenger);
+                     newPassengers.add(passenger.root);
+-                    passenger.root.vehicle = curr.root;
++                    passenger.root.vehicle = entity.root;
+                 }
+-
+-                curr.root.passengers = ImmutableList.copyOf(newPassengers);
+-            }
++                entity.root.passengers = ImmutableList.copyOf(newPassengers);
++                return passengers;
+         }
++        // Luminol End - EndGateway Portal Passengers Fix
+ 
+         public void addTracker() {
+             for (final EntityTreeNode node : this.getFullTree()) {
+@@ -4561,6 +4568,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
+     }
+ 
++    // Luminol start - Add afterPortalLogic
++    protected void afterPortalLogic() {
++
++    }
++    // Luminol end - Add afterPortalLogic
++
+     protected boolean portalToAsync(ServerLevel destination, BlockPos portalPos, boolean takePassengers,
+                                     PortalType type, java.util.function.Consumer<Entity> teleportComplete) {
+         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot portal entity async");
+@@ -4644,6 +4657,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+                         info.postTeleportTransition().onTransition(teleported);
+                     }
+ 
++                    teleported.afterPortalLogic(); // Luminol - Add afterPortalLogic
++
+                     // Kaiiju start - vanilla end teleportation
+                     /*if (teleportComplete != null) {
+                         teleportComplete.accept(teleported);
+diff --git a/net/minecraft/world/entity/PortalProcessor.java b/net/minecraft/world/entity/PortalProcessor.java
+index 46d989aef0eceebd98bfd93999153319de77a8a0..6e9171fa0c636439bd96401ea9e5fe80ffdc8bdd 100644
+--- a/net/minecraft/world/entity/PortalProcessor.java
++++ b/net/minecraft/world/entity/PortalProcessor.java
+@@ -9,12 +9,14 @@ import net.minecraft.world.level.portal.TeleportTransition;
+ public class PortalProcessor {
+     private final Portal portal;
+     private BlockPos entryPosition;
++    private net.minecraft.world.phys.Vec3 speedVec3; // Luminol - Entity portal-teleport speed fix
+     private int portalTime;
+     private boolean insidePortalThisTick;
+ 
+-    public PortalProcessor(Portal portal, BlockPos entryPosition) {
++    public PortalProcessor(Portal portal, BlockPos entryPosition, net.minecraft.world.phys.Vec3 speedVec3) { // Luminol - Entity portal-teleport speed fix
+         this.portal = portal;
+         this.entryPosition = entryPosition;
++        this.speedVec3 = speedVec3; // Luminol - Entity portal-teleport speed fix
+         this.insidePortalThisTick = true;
+     }
+ 
+@@ -35,7 +37,15 @@ public class PortalProcessor {
+ 
+     // Folia start - region threading
+     public boolean portalAsync(ServerLevel sourceWorld, Entity portalTarget) {
+-        return this.portal.portalAsync(sourceWorld, portalTarget, this.entryPosition);
++        // Luminol start - Entity portal-teleport speed fix
++        net.minecraft.world.phys.Vec3 oldSpeed = portalTarget.getDeltaMovement();
++        portalTarget.setDeltaMovement(this.speedVec3);
++        boolean flag = this.portal.portalAsync(sourceWorld, portalTarget, this.entryPosition);
++        if (!flag) {
++            portalTarget.setDeltaMovement(oldSpeed);
++        }
++        return flag;
++        // Luminol end - Entity portal-teleport speed fix
+     }
+     // Folia end - region threading
+ 
+diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
+index 88570bb4aa02896545805d7721c45cf9599befea..bbf9748a36404139356db606dbb3b0cc13c66b50 100644
+--- a/net/minecraft/world/entity/item/PrimedTnt.java
++++ b/net/minecraft/world/entity/item/PrimedTnt.java
+@@ -251,4 +251,10 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+         return !this.level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
+     }
+     // Paper end - Option to prevent TNT from moving in water
++
++    // Luminol start - Add afterPortalLogic
++    protected void afterPortalLogic() {
++        this.setUsedPortal(true);
++    }
++    // Luminol start - Add afterPortalLogic
+ }

luminol-server/minecraft-patches/features/0053-Leaves-Disable-moved-wrongly-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Disable moved wrongly threshold
 
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a2fe9286d432909ba0cb3731a166514af768dc37..d60721767f94336eaba09b9bdb12a1420c264e49 100644
+index a107d9ee24d0e39ce3e3e09bf27af1ea4ae35b96..225045400f152a9a8f030d6fe367764b00d99b24 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -581,7 +581,7 @@ public class ServerGamePacketListenerImpl

luminol-server/minecraft-patches/features/0055-Leaves-Fix-SculkCatalyst-exp-skip.patch

@@ -0,0 +1,78 @@
+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
+
+
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index ca67950e35c7f420846337e885d95b8eabca3f37..d9ea3db817878ff56a2772ce983ff95431e1326c 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -1358,7 +1358,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         }
+ 
+         // SPIGOT-5478 must be called manually now
+-        if (event.shouldDropExperience()) this.dropExperience(this.serverLevel(), cause.getEntity()); // Paper - tie to event
++        if (shouldDropExperience(event.shouldDropExperience(), event.forceUseEventDropStatus())) this.dropExperience(this.serverLevel(), cause.getEntity()); // Paper - tie to event // Leaves - exp fix
+         // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
+         if (!event.getKeepInventory()) {
+             // Paper start - PlayerDeathEvent#getItemsToKeep
+@@ -1392,6 +1392,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         this.setClientLoaded(false);
+     }
+ 
++    // Leaves start - exp fix
++    private boolean shouldDropExperience(boolean eventResult, boolean forceUseEvent) {
++        if (forceUseEvent) {
++            return eventResult;
++        }
++        return wasExperienceConsumed() ? false : eventResult;
++    }
++    // Leaves end - exp fix
++
+     private void tellNeutralMobsThatIDied() {
+         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 2293c3db45e9ecce4e0d4b2f87b8e90228e44d94..658aa09aecf8d64145feedb82dc9be2a55201450 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -293,6 +293,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+     protected float appliedScale = 1.0F;
+     // CraftBukkit start
+     public int expToDrop;
++    public int expToReward; // Leaves - exp fix
+     public ArrayList<DefaultDrop> drops = new ArrayList<>(); // Paper - Restore vanilla drops behavior
+     public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
+     public boolean collides = true;
+@@ -1761,6 +1762,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+                         entity.killedEntity((ServerLevel) this.level(), this);
+                     }
+                     this.gameEvent(GameEvent.ENTITY_DIE);
++                    if (!this.wasExperienceConsumed()) this.dropExperience((ServerLevel) this.level(), damageSource.getEntity()); // Leaves - exp fix
+                 } else {
+                     this.dead = false;
+                     this.setHealth((float) deathEvent.getReviveHealth());
+@@ -1835,7 +1837,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+         this.drops = new ArrayList<>();
+         // this.dropEquipment(level); // CraftBukkit - moved up
+         // CraftBukkit end
+-        this.dropExperience(level, damageSource.getEntity());
++        // this.dropExperience(level, damageSource.getEntity()); // Leaves - exp fix
+         return deathEvent; // Paper
+     }
+ 
+diff --git a/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java b/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
+index bd6693af6412fb08a28ca9a71d5c70d54f72c6e6..8c2e35d087150fb0fc67c7457a4af9298f4b41e1 100644
+--- a/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
+@@ -96,8 +96,7 @@ public class SculkCatalystBlockEntity extends BlockEntity implements GameEventLi
+         public boolean handleGameEvent(ServerLevel level, Holder<GameEvent> gameEvent, GameEvent.Context context, Vec3 pos) {
+             if (gameEvent.is(GameEvent.ENTITY_DIE) && context.sourceEntity() instanceof LivingEntity livingEntity) {
+                 if (!livingEntity.wasExperienceConsumed()) {
+-                    DamageSource lastDamageSource = livingEntity.getLastDamageSource();
+-                    int experienceReward = livingEntity.getExperienceReward(level, Optionull.map(lastDamageSource, DamageSource::getEntity));
++                    int experienceReward = livingEntity.expToReward; // Leaves - exp fix
+                     if (livingEntity.shouldDropExperience() && experienceReward > 0) {
+                         this.sculkSpreader.addCursors(BlockPos.containing(pos.relative(Direction.UP, 0.5)), experienceReward);
+                         this.tryAwardItSpreadsAdvancement(level, livingEntity);

luminol-server/minecraft-patches/features/0056-Raytracing-tracker-experiment.patch

@@ -19,7 +19,7 @@ index 7eff847790394aecd058e7a61905da86163b4c6e..9099457f55a2829297ac1db8a69a98ff
                      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 ccf1914b4f48ecc0f4fe980510f42d5415ec1daa..ceca76a5791e319dd7cc4048c9860b1df065b95a 100644
+index 2871980e53a66bdacf7c00e7045ad01d68a972d3..2005f769d21de40621beb913446e816b87a03c3a 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -135,7 +135,7 @@ import net.minecraft.world.scores.ScoreHolder;
@@ -31,7 +31,7 @@ index ccf1914b4f48ecc0f4fe980510f42d5415ec1daa..ceca76a5791e319dd7cc4048c9860b1d
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-@@ -6049,4 +6049,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -6080,4 +6080,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      // Paper end - Expose entity id counter
  
      public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
@@ -93,10 +93,10 @@ index d9cc1d7e56c37d5ce92544edc10e89dbc89dd15d..39e7689be243b9c99b507d665f659135
      public EntityType(
          EntityType.EntityFactory<T> factory,
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index ae049c5c3593525b991d865fec695c00ad408a59..ad34d0e1ab16fb269b3cec2842bfc2f2c29b452e 100644
+index c6252a245e9701f69db1fe167f6590095237553a..40b91234fd2e4f4f134d309590ea6b605f764e83 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -210,6 +210,25 @@ public abstract class Player extends LivingEntity {
+@@ -211,6 +211,25 @@ public abstract class Player extends LivingEntity {
          return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -122,7 +122,7 @@ index ae049c5c3593525b991d865fec695c00ad408a59..ad34d0e1ab16fb269b3cec2842bfc2f2
  
      public Player(Level level, BlockPos pos, float yRot, GameProfile gameProfile) {
          super(EntityType.PLAYER, level);
-@@ -262,6 +281,26 @@ public abstract class Player extends LivingEntity {
+@@ -263,6 +282,26 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public void tick() {
@@ -149,7 +149,7 @@ index ae049c5c3593525b991d865fec695c00ad408a59..ad34d0e1ab16fb269b3cec2842bfc2f2
          this.noPhysics = this.isSpectator();
          if (this.isSpectator() || this.isPassenger()) {
              this.setOnGround(false);
-@@ -1504,6 +1543,7 @@ public abstract class Player extends LivingEntity {
+@@ -1505,6 +1544,7 @@ public abstract class Player extends LivingEntity {
          if (this.containerMenu != null && this.hasContainerOpen()) {
              this.doCloseContainer();
          }

luminol-server/minecraft-patches/features/0057-Lithium-Fast-util.patch

@@ -0,0 +1,90 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bacteriawa <A3167717663@hotmail.com>
+Date: Thu, 7 Nov 2024 21:50:47 +0100
+Subject: [PATCH] Lithium: Fast util
+
+This patch is based on the following mixins:
+* "net/caffeinemc/mods/lithium/mixin/math/fast_util/DirectionMixin.java"
+* "net/caffeinemc/mods/lithium/mixin/math/fast_util/AABBMixin.java"
+By: 2No2Name <2No2Name@web.de>
+As part of: 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/core/Direction.java b/net/minecraft/core/Direction.java
+index 216f97207dac88cc1dc3df59c6ee8a62c7614b4a..3a76b1ec8570e4c9f328e9d362b41057b092be45 100644
+--- a/net/minecraft/core/Direction.java
++++ b/net/minecraft/core/Direction.java
+@@ -217,7 +217,7 @@ public enum Direction implements StringRepresentable, ca.spottedleaf.moonrise.pa
+     }
+ 
+     public Direction getOpposite() {
+-        return this.opposite; // Paper - optimise collisions
++        return VALUES[this.oppositeIndex]; // Leaf - Lithium - fast util
+     }
+ 
+     public Direction getClockWise(Direction.Axis axis) {
+@@ -350,7 +350,7 @@ public enum Direction implements StringRepresentable, ca.spottedleaf.moonrise.pa
+     }
+ 
+     public static Direction getRandom(RandomSource random) {
+-        return Util.getRandom(VALUES, random);
++        return VALUES[random.nextInt(VALUES.length)]; // Leaf - Lithium - fast util
+     }
+ 
+     public static Direction getApproximateNearest(double x, double y, double z) {
+diff --git a/net/minecraft/world/phys/AABB.java b/net/minecraft/world/phys/AABB.java
+index 85148858db1fd5e9da8bbdde4b0d84110d80e373..82fb85089336f874349fa87e7cb9c14ab087ad8b 100644
+--- a/net/minecraft/world/phys/AABB.java
++++ b/net/minecraft/world/phys/AABB.java
+@@ -18,6 +18,15 @@ public class AABB {
+     public final double maxY;
+     public final double maxZ;
+ 
++    // Leaf start - Lithium - fast util
++    static {
++        assert Direction.Axis.X.ordinal() == 0;
++        assert Direction.Axis.Y.ordinal() == 1;
++        assert Direction.Axis.Z.ordinal() == 2;
++        assert Direction.Axis.values().length == 3;
++    }
++    // Leaf end - Lithium - fast util
++
+     public AABB(double x1, double y1, double z1, double x2, double y2, double z2) {
+         this.minX = Math.min(x1, x2);
+         this.minY = Math.min(y1, y2);
+@@ -79,11 +88,33 @@ public class AABB {
+     }
+ 
+     public double min(Direction.Axis axis) {
+-        return axis.choose(this.minX, this.minY, this.minZ);
++        // Leaf start - Lithium - fast util
++        switch (axis.ordinal()) {
++            case 0: //X
++                return this.minX;
++            case 1: //Y
++                return this.minY;
++            case 2: //Z
++                return this.minZ;
++        }
++
++        throw new IllegalArgumentException();
++        // Leaf end - Lithium - fast util
+     }
+ 
+     public double max(Direction.Axis axis) {
+-        return axis.choose(this.maxX, this.maxY, this.maxZ);
++        // Leaf start - Lithium - fast util
++        switch (axis.ordinal()) {
++            case 0: //X
++                return this.maxX;
++            case 1: //Y
++                return this.maxY;
++            case 2: //Z
++                return this.maxZ;
++        }
++
++        throw new IllegalArgumentException();
++        // Leaf end - Lithium - fast util
+     }
+ 
+     @Override

luminol-server/minecraft-patches/features/0058-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch

@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: kidofcubes <kidofcubes@gmail.com>
+Date: Fri, 8 Nov 2024 00:22:44 +0800
+Subject: [PATCH] Lithium: Skip unnecessary calculations if player is not
+ flying or swing
+
+This patch is based on the following mixins:
+* "net/caffeinemc/mods/lithium/mixin/entity/fast_elytra_check/LivingEntityMixin.java"
+* "net/caffeinemc/mods/lithium/mixin/entity/fast_hand_swing/LivingEntityMixin.java"
+By: 2No2Name <2No2Name@web.de>
+As part of: 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/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index 658aa09aecf8d64145feedb82dc9be2a55201450..1df158d30622ea71fcc937140c682d0e994d54c1 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -2644,6 +2644,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+     }
+ 
+     protected void updateSwingTime() {
++        if (!this.swinging && this.swingTime == 0) return; // Leaf - Lithium - entity.fast_hand_swing
+         int currentSwingDuration = this.getCurrentSwingDuration();
+         if (this.swinging) {
+             this.swingTime++;
+@@ -3569,6 +3570,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+     protected void updateFallFlying() {
+         this.checkSlowFallDistance();
+         if (!this.level().isClientSide) {
++            if (!this.isFallFlying() && this.fallFlyTicks == 0) return; // Leaf - Lithium - entity.fast_elytra_check
+             if (!this.canGlide()) {
+                 if (this.getSharedFlag(7) != false && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
+                 this.setSharedFlag(7, false);

luminol-server/minecraft-patches/features/0059-Cross-Region-Damage-trace.patch

@@ -0,0 +1,148 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 29 Apr 2025 23:03:56 +0800
+Subject: [PATCH] Cross Region Damage trace
+
+
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index d9ea3db817878ff56a2772ce983ff95431e1326c..fd4e37719baced819100f7ad2d1cf0350950cb60 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
++++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -1378,6 +1378,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+             this.awardStat(Stats.ENTITY_KILLED_BY.get(killCredit.getType()));
+             killCredit.awardKillScore(this, cause);
+             this.createWitherRose(killCredit);
++        // Luminol Start - Cross Region Damage trace
++        } else if (me.earthme.luminol.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
++            final LivingEntity entitylivingnew = this.getKillCreditOrigin();
++            if (entitylivingnew != null) {
++                this.damageTransferToAsync(entitylivingnew, cause);
++            }
++        // Luminol End - Cross Region Damage trace
+         }
+ 
+         this.level().broadcastEntityEvent(this, (byte)3);
+@@ -1392,6 +1399,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         this.setClientLoaded(false);
+     }
+ 
++    // Luminol Start - Cross Region Damage trace
++    private void damageTransferToAsync(LivingEntity entity, DamageSource cause) {
++        // Operations running on current entity
++        this.awardStat(Stats.ENTITY_KILLED_BY.get(entity.getType()));
++        this.createWitherRose(entity);
++
++        // the entity might be in another tickregion sometimes, so we need to schedule the task onto the entity
++        // to ensure thread safe
++        entity.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
++            try {
++                nmsEntity.awardKillScore(this, cause);
++            } catch (Throwable ex) {
++                LOGGER.error(ex.getMessage(), ex);
++            }
++        }, null, 1L );
++    }
++    // Luminol End - Cross Region Damage trace
++
+     // Leaves start - exp fix
+     private boolean shouldDropExperience(boolean eventResult, boolean forceUseEvent) {
+         if (forceUseEvent) {
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index 1df158d30622ea71fcc937140c682d0e994d54c1..4eddc407d04428516dc3607e4726d3ff58588c62 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -1181,6 +1181,29 @@ public abstract class LivingEntity extends Entity implements Attackable {
+         }
+     }
+ 
++    // Luminol Start - raid revert adapt Cross Region Damage trace
++    public boolean addEffect(MobEffectInstance effectInstance, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause, boolean fireEvent, boolean async) {
++        if (ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
++            return addEffect(effectInstance, entity, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN, true);
++        } else if (me.earthme.luminol.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
++            postToEntityThreadAddEffect(effectInstance, entity, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN, true);
++            return true;
++        }
++        return false;
++    }
++
++    private void postToEntityThreadAddEffect(MobEffectInstance effectInstance, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause, boolean fireEvent) {
++        if (entity != null)
++            entity.getBukkitEntity().taskScheduler.schedule((Entity nmsEntity) -> {
++                try {
++                    addEffect(effectInstance, nmsEntity, cause, fireEvent);
++                } catch (Throwable ex) {
++                    LOGGER.error(ex.getMessage(), ex);
++                }
++            }, null, 1L );
++    }
++    // Luminol End - raid revert adapt Cross Region Damage trace
++
+     public boolean canBeAffected(MobEffectInstance effectInstance) {
+         if (this.getType().is(EntityTypeTags.IMMUNE_TO_INFESTED)) {
+             return !effectInstance.is(MobEffects.INFESTED);
+@@ -1831,6 +1854,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+             final LivingEntity entityliving = this.getKillCredit();
+             if (entityliving != null) {
+                 entityliving.awardKillScore(this, damageSource);
++            // Luminol Start - Cross Region Damage trace
++            } else if (me.earthme.luminol.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
++                final LivingEntity entitylivingnew = this.getKillCreditOrigin();
++                if (entitylivingnew != null) {
++                    this.damageTransferToAsync(entitylivingnew, damageSource);
++                }
++            // Luminol End - Cross Region Damage trace
+             }
+         }); // Paper end
+         this.postDeathDropItems(deathEvent); // Paper
+@@ -1841,6 +1871,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
+         return deathEvent; // Paper
+     }
+ 
++    // Luminol Start - Cross Region Damage trace
++    private void damageTransferToAsync(LivingEntity entity, DamageSource damageSource) {
++        entity.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
++            try {
++                nmsEntity.awardKillScore(this, damageSource);
++            } catch (Throwable ex) {
++                LOGGER.error(ex.getMessage(), ex);
++            }
++        }, null, 1L );
++    }
++    // Luminol End - Cross Region Damage trace
++
+     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
+@@ -2474,6 +2516,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
+         }
+     }
+ 
++    // Luminol Start - Cross Region Damage trace
++    @Nullable
++    public LivingEntity getKillCreditOrigin() {
++        if (this.lastHurtByPlayer != null) {
++            return this.lastHurtByPlayer;
++        } else if (this.lastHurtByMob != null) {
++            return this.lastHurtByMob;
++        }
++        return null;
++    }
++    // Luminol End - Cross Region Damage trace
++
+     public final float getMaxHealth() {
+         return (float)this.getAttributeValue(Attributes.MAX_HEALTH);
+     }
+diff --git a/net/minecraft/world/item/component/OminousBottleAmplifier.java b/net/minecraft/world/item/component/OminousBottleAmplifier.java
+index 5607d2f21131510563f8fdc9079d1145483b11df..f709880a8c1064298aa133617055e7aa5cc2be5e 100644
+--- a/net/minecraft/world/item/component/OminousBottleAmplifier.java
++++ b/net/minecraft/world/item/component/OminousBottleAmplifier.java
+@@ -28,7 +28,7 @@ public record OminousBottleAmplifier(int value) implements ConsumableListener, T
+ 
+     @Override
+     public void onConsume(Level level, LivingEntity entity, ItemStack stack, Consumable consumable) {
+-        entity.addEffect(new MobEffectInstance(MobEffects.BAD_OMEN, 120000, this.value, false, false, true)); // Paper - properly resend entities - diff on change for below
++        entity.addEffect(new MobEffectInstance(MobEffects.BAD_OMEN, me.earthme.luminol.config.modules.misc.RaidChangesConfig.infinite ? net.minecraft.world.effect.MobEffectInstance.INFINITE_DURATION : 120000, this.value, false, false, true)); // Paper - properly resend entities - diff on change for below // Luminol - Raid effect infinite
+     }
+ 
+     // Paper start - properly resend entities - collect packets for bundle

luminol-server/minecraft-patches/features/0060-Add-config-to-enable-tick-command.patch

@@ -0,0 +1,167 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Thu, 1 May 2025 22:43:08 +0800
+Subject: [PATCH] Add config to enable tick command
+
+
+diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
+index 1382c695c4991488b113401e231875ddc74f6b01..68280b07a71dcdb42eaee6f62fbda074813a22e4 100644
+--- a/io/papermc/paper/threadedregions/RegionizedServer.java
++++ b/io/papermc/paper/threadedregions/RegionizedServer.java
+@@ -286,6 +286,11 @@ public final class RegionizedServer {
+         this.randomWalk();
+          */
+         ++this.tickCount;
++        // Luminol start - Add a config to enable tick command
++        if (me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled) {
++            MinecraftServer.tickRateManager.tick();
++        }
++        // Luminol end - Add a config to enable tick command
+         // expire invalid click command callbacks
+         io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue((int)this.tickCount);
+ 
+@@ -308,6 +313,13 @@ public final class RegionizedServer {
+             this.globalTick(world, tickCount);
+         }
+ 
++        // Luminol start - Add a config to enable tick command
++        if (me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled) {
++            MinecraftServer.tickRateManager.reduceSprintTicks();
++            MinecraftServer.tickRateManager.endTickWork();
++        }
++        // Luminol end - Add a config to enable tick command
++
+         // tick connections
+         this.tickConnections();
+ 
+@@ -441,7 +453,7 @@ public final class RegionizedServer {
+     }
+ 
+     private void tickTime(final ServerLevel world, final int tickCount) {
+-        if (world.tickTime) {
++        if ((!me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command
+             if (world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
+                 world.setDayTime(world.levelData.getDayTime() + (long)tickCount);
+             }
+diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
+index 7123b3eb2f2e52946b8ef9de993a6828eb0bb6f7..82948984404a183711588932a4a026dc4c241feb 100644
+--- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
++++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
+@@ -31,8 +31,8 @@ public final class TickRegionScheduler {
+         }
+     }
+ 
+-    public static final int TICK_RATE = 20;
+-    public static final long TIME_BETWEEN_TICKS = 1_000_000_000L / TICK_RATE; // ns
++    public static float TICK_RATE = 20; // Luminol - Add tick command support
++    public static long TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE); // ns // Luminol - Add tick command support
+ 
+     // Folia start - watchdog
+     public static final FoliaWatchdogThread WATCHDOG_THREAD = new FoliaWatchdogThread();
+@@ -375,8 +375,23 @@ public final class TickRegionScheduler {
+             final long cpuStart = MEASURE_CPU_TIME ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0L;
+             final long tickStart = System.nanoTime();
+ 
+-            // use max(), don't assume that tickStart >= scheduledStart
+-            final int tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
++            // Luminol start - Add a config to enable tick command
++            final int tickCount;
++            if (me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled) {
++                if (MinecraftServer.tickRateManager.isSprinting() && MinecraftServer.tickRateManager.checkShouldSprintThisTick()) {
++                    TICK_RATE = net.minecraft.server.commands.TickCommand.MAX_TICKRATE;
++                    TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE);
++                    tickCount = 1;
++                } else {
++                    TICK_RATE = MinecraftServer.tickRateManager.tickrate();
++                    TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE);
++                    tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
++                }
++            } else {
++                // use max(), don't assume that tickStart >= scheduledStart
++                tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
++            }
++            // Luminol end - Add tick command support
+ 
+             if (!this.tryMarkTicking()) {
+                 if (!this.cancelled.get()) {
+@@ -416,6 +431,11 @@ public final class TickRegionScheduler {
+             try {
+                 // next start isn't updated until the end of this tick
+                 this.tickRegion(tickCount, tickStart, scheduledEnd);
++                // Luminol start - Add a config to enable tick command
++                if (me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled) {
++                    MinecraftServer.tickRateManager.endTickWork();
++                }
++                // Luminol end - Add a config to enable tick command
+             } catch (final Throwable thr) {
+                 this.scheduler.regionFailed(this, false, thr);
+                 // regionFailed will schedule a shutdown, so we should avoid letting this region tick further
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index cfb37f2e428605965a37dc1eb83f302fe1bd6299..8f7b28e5688252207ad8ce9f3fb6f9c3b65d1adc 100644
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -213,7 +213,11 @@ public class Commands {
+         //TeamMsgCommand.register(this.dispatcher); // Folia - region threading - TODO later
+         TeleportCommand.register(this.dispatcher);
+         TellRawCommand.register(this.dispatcher, context);
+-        //TickCommand.register(this.dispatcher); // Folia - region threading - TODO later
++        // Luminol start - Add a config to enable tick command
++        if (me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled) {
++            TickCommand.register(this.dispatcher); // Folia - region threading - TODO later
++        }
++        // Luminol end - Add a config to enable tick command
+         TimeCommand.register(this.dispatcher);
+         TitleCommand.register(this.dispatcher, context);
+         //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 330af9f4de1c72387326816065350e71fe546efe..e62e8b9af7ad3e4454702ac86ad2b27973eba66f 100644
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
+@@ -267,7 +267,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     private String serverId;
+     public MinecraftServer.ReloadableResources resources;
+     private final StructureTemplateManager structureTemplateManager;
+-    private final ServerTickRateManager tickRateManager;
++    public static ServerTickRateManager tickRateManager; // Luminol - Add tick command support
+     protected WorldData worldData;
+     public PotionBrewing potionBrewing;
+     private FuelValues fuelValues;
+diff --git a/net/minecraft/server/ServerTickRateManager.java b/net/minecraft/server/ServerTickRateManager.java
+index 40338efd1c0e56d869d03f1d0687e7ff0fcbf11a..d0d90a25a10bbecfffceee1992af88c60d14fd87 100644
+--- a/net/minecraft/server/ServerTickRateManager.java
++++ b/net/minecraft/server/ServerTickRateManager.java
+@@ -105,7 +105,7 @@ public class ServerTickRateManager extends TickRateManager {
+             return false;
+         } else if (this.remainingSprintTicks > 0L) {
+             this.sprintTickStartTime = System.nanoTime();
+-            this.remainingSprintTicks--;
++            // this.remainingSprintTicks--; // Luminol - Add tick command support
+             return true;
+         } else {
+             this.finishTickSprint();
+@@ -113,6 +113,12 @@ public class ServerTickRateManager extends TickRateManager {
+         }
+     }
+ 
++    // Luminol start - Add tick command support
++    public void reduceSprintTicks() {
++        this.remainingSprintTicks--;
++    }
++    // Luminol end - Add tick command support
++
+     public void endTickWork() {
+         this.sprintTimeSpend = this.sprintTimeSpend + (System.nanoTime() - this.sprintTickStartTime);
+     }
+diff --git a/net/minecraft/server/commands/TickCommand.java b/net/minecraft/server/commands/TickCommand.java
+index 6b6c8ce49eda6806c8288d70848dd143ba2c4703..5d09d2c8bb45cc10b2a13100793249adc7b5a7e9 100644
+--- a/net/minecraft/server/commands/TickCommand.java
++++ b/net/minecraft/server/commands/TickCommand.java
+@@ -14,7 +14,7 @@ import net.minecraft.server.ServerTickRateManager;
+ import net.minecraft.util.TimeUtil;
+ 
+ public class TickCommand {
+-    private static final float MAX_TICKRATE = 10000.0F;
++    public static final float MAX_TICKRATE = 10000.0F; // Luminol - Add tick command support
+     private static final String DEFAULT_TICKRATE = String.valueOf(20);
+ 
+     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {

luminol-server/minecraft-patches/removed/0024-Fully-removed-player-teleport-event-and-entity-telep.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Sat, 19 Apr 2025 20:38:20 +0800
+Subject: [PATCH] Fully removed player teleport event and entity teleport event
+ call
+
+
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index a107d9ee24d0e39ce3e3e09bf27af1ea4ae35b96..e786177f9e36c1dfb0cdcfc641ab2e36d42f2451 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1764,7 +1764,7 @@ public class ServerGamePacketListenerImpl
+             final io.papermc.paper.entity.TeleportFlag.Relative flag = org.bukkit.craftbukkit.entity.CraftPlayer.deltaRelativeToAPI(relativeArgument);
+             if (flag != null) relativeFlags.add(flag);
+         }
+-        PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause, java.util.Set.copyOf(relativeFlags));
++        /*PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause, java.util.Set.copyOf(relativeFlags)); // Luminol - Fully remove EntityTeleportEvent and PlayerTeleportEvent
+         // Paper end - Teleport API
+         this.cserver.getPluginManager().callEvent(event);
+ 
+@@ -1773,9 +1773,10 @@ public class ServerGamePacketListenerImpl
+             to = event.isCancelled() ? event.getFrom() : event.getTo();
+             posMoveRotation = new PositionMoveRotation(CraftLocation.toVec3D(to), Vec3.ZERO, to.getYaw(), to.getPitch());
+         }
++        */ // Luminol - Fully remove EntityTeleportEvent and PlayerTeleportEvent
+ 
+         this.internalTeleport(posMoveRotation, relatives);
+-        return !event.isCancelled(); // CraftBukkit - Return event status
++        return true; //!event.isCancelled(); // CraftBukkit - Return event status // Luminol - Fully remove EntityTeleportEvent and PlayerTeleportEvent
+     }
+ 
+     public void teleport(Location dest) {
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index 6258b008ad3e00d41e9f3014572d6f7a06b1847c..1981f8e9e158ba7874dd3c9bde127654d56170ce 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -4226,7 +4226,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+                 this.setPos(x1, y1, z1);
+ 
+                 if (flag) {
+-                    if (!(this instanceof ServerPlayer)) {
++                    if (!(this instanceof ServerPlayer) && false) { // Luminol - Fully remove EntityTeleportEvent and PlayerTeleportEvent
+                         EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), new Location(this.level().getWorld(), x1, y1, z1), new Location(this.level().getWorld(), x, d, z));
+                         this.level().getCraftServer().getPluginManager().callEvent(teleport);
+                         if (!teleport.isCancelled() && teleport.getTo() != null) { // Paper

luminol-server/minecraft-patches/removed/0044-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch

@@ -0,0 +1,125 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Fri, 18 Apr 2025 22:04:20 +0800
+Subject: [PATCH] Leaf Smart sort entities in NearestLivingEntitySensor
+
+
+diff --git a/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java b/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
+index b0c5e41fefc7c9adf1a61bd5b52861736657d37e..b91c4aa042f6ac10e402bcf16a03d24d6dafec86 100644
+--- a/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
++++ b/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
+@@ -13,18 +13,107 @@ import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities;
+ import net.minecraft.world.phys.AABB;
+ 
+ public class NearestLivingEntitySensor<T extends LivingEntity> extends Sensor<T> {
++
++    // Leaf start - Optimized entity sorting with buffer reuse
++    private static final int SMALL_ARRAY_THRESHOLD = 2;
++    private final ThreadLocal<LivingEntity[]> entityBuffer = ThreadLocal.withInitial(() -> new LivingEntity[0]);
++    private final ThreadLocal<long[]> bitsBuffer = ThreadLocal.withInitial(() -> new long[0]);
++
+     @Override
+     protected void doTick(ServerLevel level, T entity) {
+-        double attributeValue = entity.getAttributeValue(Attributes.FOLLOW_RANGE);
+-        AABB aabb = entity.getBoundingBox().inflate(attributeValue, attributeValue, attributeValue);
+-        List<LivingEntity> entitiesOfClass = level.getEntitiesOfClass(
+-            LivingEntity.class, aabb, matchableEntity -> matchableEntity != entity && matchableEntity.isAlive()
++        double range = entity.getAttributeValue(Attributes.FOLLOW_RANGE);
++        double rangeSqr = range * range;
++        AABB aabb = entity.getBoundingBox().inflate(range, range, range);
++
++        List<LivingEntity> entities = level.getEntitiesOfClass(
++            LivingEntity.class, aabb, e -> e != entity && e.isAlive() && entity.distanceToSqr(e) <= rangeSqr
+         );
+-        entitiesOfClass.sort(Comparator.comparingDouble(entity::distanceToSqr));
++
++        LivingEntity[] sorted = smartSort(entities, entity);
++        List<LivingEntity> sortedList = java.util.Arrays.asList(sorted);
++
+         Brain<?> brain = entity.getBrain();
+-        brain.setMemory(MemoryModuleType.NEAREST_LIVING_ENTITIES, entitiesOfClass);
+-        brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, new NearestVisibleLivingEntities(level, entity, entitiesOfClass));
++        brain.setMemory(MemoryModuleType.NEAREST_LIVING_ENTITIES, sortedList);
++        brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES,
++            new NearestVisibleLivingEntities(level, entity, sortedList));
++    }
++
++    private LivingEntity[] smartSort(List<LivingEntity> entities, T reference) {
++        int size = entities.size();
++        if (size <= 1) return entities.toArray(new LivingEntity[0]);
++
++        LivingEntity[] entityBufferArray = this.entityBuffer.get();
++        long[] bitsBufferArray = this.bitsBuffer.get();
++        if (entityBufferArray.length < size) {
++            entityBufferArray = new LivingEntity[size];
++            entityBuffer.set(entityBufferArray);
++
++            bitsBufferArray = new long[size];
++            bitsBuffer.set(bitsBufferArray);
++        }
++
++        for (int i = 0; i < size; i++) {
++            LivingEntity e = entities.get(i);
++            entityBufferArray[i] = e;
++            bitsBufferArray[i] = Double.doubleToRawLongBits(reference.distanceToSqr(e));
++        }
++
++        fastRadixSort(entityBufferArray, bitsBufferArray, 0, size - 1, 62);
++
++        return java.util.Arrays.copyOf(entityBufferArray, size);
++    }
++
++    private void fastRadixSort(LivingEntity[] ents, long[] bits, int low, int high, int bit) {
++        if (bit < 0 || low >= high) return;
++
++        if (high - low <= SMALL_ARRAY_THRESHOLD) {
++            insertionSort(ents, bits, low, high);
++            return;
++        }
++
++        int i = low, j = high;
++        final long mask = 1L << bit;
++
++        while (i <= j) {
++            while (i <= j && (bits[i] & mask) == 0) i++;
++            while (i <= j && (bits[j] & mask) != 0) j--;
++
++            if (i < j) {
++                swap(ents, bits, i++, j--);
++            }
++        }
++
++        if (low < j) fastRadixSort(ents, bits, low, j, bit - 1);
++        if (i < high) fastRadixSort(ents, bits, i, high, bit - 1);
++    }
++
++    private void insertionSort(LivingEntity[] ents, long[] bits, int low, int high) {
++        for (int i = low + 1; i <= high; i++) {
++            int j = i;
++            LivingEntity e = ents[j];
++            long b = bits[j];
++
++            while (j > low && bits[j - 1] > b) {
++                ents[j] = ents[j - 1];
++                bits[j] = bits[j - 1];
++                j--;
++            }
++
++            ents[j] = e;
++            bits[j] = b;
++        }
++    }
++
++    private void swap(LivingEntity[] ents, long[] bits, int a, int b) {
++        LivingEntity te = ents[a];
++        ents[a] = ents[b];
++        ents[b] = te;
++
++        long tb = bits[a];
++        bits[a] = bits[b];
++        bits[b] = tb;
+     }
++    // Leaf end - Optimized entity sorting with buffer reuse
+ 
+     @Override
+     public Set<MemoryModuleType<?>> requires() {

luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch

@@ -22,10 +22,10 @@ index de8b9048c8395c05b8688bc9d984b8ad680f15b3..f42692cd4f0154705c3d5b030d281cfc
 +    // KioCG end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c9afcd46f6a1b74b82ed68f1df6188369cf53a73..7cb95021f547c94eae7cef0bf5b2d8dff0a04937 100644
+index ac878520dc4aaa0e6a1ce8de0982d60a8397bc15..af20bc3b9cfb056beca0a341e209a4cc5e869da3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2404,6 +2404,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2401,6 +2401,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  handle.expToDrop = data.getInt("expToDrop");
                  handle.keepLevel = data.getBoolean("keepLevel");
              }
@@ -41,7 +41,7 @@ index c9afcd46f6a1b74b82ed68f1df6188369cf53a73..7cb95021f547c94eae7cef0bf5b2d8df
          }
      }
  
-@@ -2425,6 +2434,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2422,6 +2431,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.putLong("lastPlayed", System.currentTimeMillis());
          data.putString("lastKnownName", handle.getScoreboardName());
  
@@ -57,9 +57,9 @@ index c9afcd46f6a1b74b82ed68f1df6188369cf53a73..7cb95021f547c94eae7cef0bf5b2d8df
          // Paper start - persist for use in offline save data
          if (!nbttagcompound.contains("Paper")) {
              nbttagcompound.put("Paper", new CompoundTag());
-@@ -3618,4 +3636,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public void setDeathScreenScore(final int score) {
-         getHandle().setScore(score);
+@@ -3631,4 +3649,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+     public void setSimplifyContainerDesyncCheck(final boolean simplifyContainerDesyncCheck) {
+         this.simplifyContainerDesyncCheck = simplifyContainerDesyncCheck;
      }
 +
 +    // KioCG start - ChunkHot

luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch

@@ -18,7 +18,7 @@ index a0b84535a9d3833d4df692b85b272f145559dd80..c2ba46408b5ad727d7a17f21d47b2898
              return;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6c2d9c9621f665412f1a8ccc41083fb0e3a07ed5..fb0ba43c8102a205d1402f53d47823672d2edfbe 100644
+index ae7ee8c67a71b0bc319d8079094b1806fc3e305a..07e59bbfa94103d610ec63e695e51a961cd6eec5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -314,7 +314,7 @@ public final class CraftServer implements Server {

luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] SparklyPaper Optimize canSee checks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7cb95021f547c94eae7cef0bf5b2d8dff0a04937..b80795605a61cb0d7aa9fa7eec960d9a13d8c030 100644
+index af20bc3b9cfb056beca0a341e209a4cc5e869da3..91dd18a874ea83bed83983ecfa52decce2b163a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -214,7 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -210,7 +210,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private boolean hasPlayedBefore = false;
      private final ConversationTracker conversationTracker = new ConversationTracker();
      private final Set<String> channels = new HashSet<String>();
@@ -17,7 +17,7 @@ index 7cb95021f547c94eae7cef0bf5b2d8dff0a04937..b80795605a61cb0d7aa9fa7eec960d9a
      private final Set<UUID> unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player
      private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
      private int hash = 0;
-@@ -2268,9 +2268,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2265,9 +2265,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {

luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch

@@ -23,7 +23,7 @@ index f42692cd4f0154705c3d5b030d281cfc333803ed..39cc976f65f826a00e2e637c139f9134
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fb0ba43c8102a205d1402f53d47823672d2edfbe..d8627561b5ffec33e0c42974aa5e3d421c8cfac2 100644
+index 07e59bbfa94103d610ec63e695e51a961cd6eec5..9c7a5d0a94417a65788330b7239aa746006407fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1423,7 +1423,11 @@ public final class CraftServer implements Server {

luminol-server/paper-patches/features/0010-Tick-regions-api.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Tick regions api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 82d26889661a944e057be0c450fb5a296122ea8e..4f320a91fb8abe21cbb7b01fdc34330def5b2448 100644
+index cd6e46fa68c009deb8dfebcecb88e058dfede0b0..ac4ab407095d998b1418d740ab54e8157bce6a02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2517,4 +2517,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {

luminol-server/paper-patches/features/0012-Leaves-Fix-SculkCatalyst-exp-skip.patch

@@ -0,0 +1,35 @@
+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:46 +0800
+Subject: [PATCH] Leaves Fix SculkCatalyst exp skip
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index bef7a026676ab59a84fc33c8af50ad2b9447fd8c..0a678458bcee4ced98d2880821dbff302f59b7f6 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -991,7 +991,7 @@ public class CraftEventFactory {
+         CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
+         CraftDamageSource bukkitDamageSource = new CraftDamageSource(damageSource);
+         CraftWorld world = (CraftWorld) entity.getWorld();
+-        EntityDeathEvent event = new EntityDeathEvent(entity, bukkitDamageSource, new io.papermc.paper.util.TransformingRandomAccessList<>(drops, Entity.DefaultDrop::stack, FROM_FUNCTION), victim.getExpReward(world.getHandle(), damageSource.getEntity())); // Paper - Restore vanilla drops behavior
++        EntityDeathEvent event = new EntityDeathEvent(entity, bukkitDamageSource, new io.papermc.paper.util.TransformingRandomAccessList<>(drops, Entity.DefaultDrop::stack, FROM_FUNCTION), victim.getExpReward(world.getHandle(), damageSource.getEntity()), victim.getExperienceReward(world.getHandle(), damageSource.getEntity())); // Paper - Restore vanilla drops behavior // Leaves - exp fix
+         populateFields(victim, event); // Paper - make cancellable
+         Bukkit.getServer().getPluginManager().callEvent(event);
+ 
+@@ -1002,6 +1002,7 @@ public class CraftEventFactory {
+         playDeathSound(victim, event);
+         // Paper end
+         victim.expToDrop = event.getDroppedExp();
++        victim.expToReward = event.getRewardExp(); // Leaves - exp fix
+         lootCheck.run(); // Paper - advancement triggers before destroying items
+ 
+         // Paper start - Restore vanilla drops behavior
+@@ -1037,6 +1038,7 @@ public class CraftEventFactory {
+         victim.newLevel = event.getNewLevel();
+         victim.newTotalExp = event.getNewTotalExp();
+         victim.expToDrop = event.getDroppedExp();
++        victim.expToReward = event.getRewardExp(); // Leaves - exp fix
+         victim.newExp = event.getNewExp();
+ 
+         // Paper start - Restore vanilla drops behavior

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/experiment/CommandTickConfig.java.patch

@@ -0,0 +1,25 @@
+--- /dev/null
++++ b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandTickConfig.java
+@@ -1,0 +_,22 @@
++package me.earthme.luminol.config.modules.experiment;
++
++import me.earthme.luminol.config.ConfigInfo;
++import me.earthme.luminol.config.EnumConfigCategory;
++import me.earthme.luminol.config.IConfigModule;
++
++public class CommandTickConfig implements IConfigModule {
++    @ConfigInfo(baseName = "enabled", comments =
++            """
++                    Allow to use tick command""")
++    public static boolean enabled = false;
++
++    @Override
++    public EnumConfigCategory getCategory() {
++        return EnumConfigCategory.EXPERIMENT;
++    }
++
++    @Override
++    public String getBaseName() {
++        return "enable_tick_command";
++    }
++}

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/experiment/EntityDamageSourceTraceConfig.java.patch

@@ -0,0 +1,25 @@
+--- /dev/null
++++ b/src/main/java/me/earthme/luminol/config/modules/experiment/EntityDamageSourceTraceConfig.java
+@@ -1,0 +_,22 @@
++package me.earthme.luminol.config.modules.experiment;
++
++import me.earthme.luminol.config.ConfigInfo;
++import me.earthme.luminol.config.EnumConfigCategory;
++import me.earthme.luminol.config.IConfigModule;
++
++public class EntityDamageSourceTraceConfig implements IConfigModule {
++    @ConfigInfo(baseName = "enabled", comments =
++            """
++                    Allow trace damage source cross different Region Scheduler.""")
++    public static boolean enabled = false;
++
++    @Override
++    public EnumConfigCategory getCategory() {
++        return EnumConfigCategory.EXPERIMENT;
++    }
++
++    @Override
++    public String getBaseName() {
++        return "entity-damage-source-trace";
++    }
++}

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/DisableHeightmapWarnConfig.java.patch

@@ -0,0 +1,25 @@
+--- /dev/null
++++ b/src/main/java/me/earthme/luminol/config/modules/misc/DisableHeightmapWarnConfig.java
+@@ -1,0 +_,22 @@
++package me.earthme.luminol.config.modules.misc;
++
++import me.earthme.luminol.config.ConfigInfo;
++import me.earthme.luminol.config.EnumConfigCategory;
++import me.earthme.luminol.config.IConfigModule;
++
++public class DisableHeightmapWarnConfig implements IConfigModule {
++    @ConfigInfo(baseName = "enabled", comments =
++            """
++                    Disable heightmap-check's warning""")
++    public static boolean enabled = false;
++
++    @Override
++    public EnumConfigCategory getCategory() {
++        return EnumConfigCategory.MISC;
++    }
++
++    @Override
++    public String getBaseName() {
++        return "heightmap_warn_disable";
++    }
++}

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch

@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java
-@@ -1,0 +_,31 @@
+@@ -1,0 +_,54 @@
 +package me.earthme.luminol.config.modules.misc;
 +
 +import me.earthme.luminol.config.ConfigInfo;
@@ -10,17 +10,40 @@
 +public class RaidChangesConfig implements IConfigModule {
 +    @ConfigInfo(baseName = "allow-bad-omen-trigger-raid", comments =
 +            """
-+                    Allow players with ominous signs to\s
-+                    skip a 30 second cooldown and trigger\s
-+                    attacks directly""")
++                    Allow players with ominous signs to skip a\s
++                    30-second cooldown and trigger attacks directly""")
 +    public static boolean trigger = false;
 +
 +    @ConfigInfo(baseName = "give-bad-omen-when-kill-patrol-leader", comments =
 +            """
-+                    Enable players to obtain an ominous\s
-+                    omen effect when killing the patrol\s
-+                    team captain""")
-+    public static boolean effect = false;;
++                    Enable players to obtain an ominous omen\s
++                    effect when killing the patrol team captain""")
++    public static boolean effect = false;
++
++    @ConfigInfo(baseName = "bad-omen-infinite", comments =
++            """
++                    Enable bad omen effect infinite time
++                        --- this config is not old version's function""")
++    public static boolean infinite = false;
++
++    @ConfigInfo(baseName = "skip-height-check", comments =
++            """
++                    Disable y <= 96 check.
++                    If you enabled revert_274911, this config will useless
++                    and always behavior of enabled""")
++    public static boolean height_check = false;
++
++    @ConfigInfo(baseName = "skip-self-raid-check", comments =
++            """
++                    Disable raid self check\s
++                        --- this config is not old version's function""")
++    public static boolean self_check = false;
++
++    @ConfigInfo(baseName = "revert-274911", comments =
++            """
++                    Revert Old raid's find spawn position logic
++                        --- This revert MC-274911""")
++    public static boolean pos_revert = false;
 +
 +    @Override
 +    public EnumConfigCategory getCategory() {

scripts/SetENV.sh

@@ -11,13 +11,10 @@ grdversion=$(prop version)
 preVersion=$(prop preVersion)
 release_tag="$mcversion-$commitid"
 jarName="$project_id-$mcversion-paperclip.jar"
-jarName_bundler="$project_id-$mcversion-bundler.jar"
 jarName_dir="luminol-server/build/libs/$jarName"
-jarName_bundler_dir="luminol-server/build/libs/$jarName_bundler"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
 
 mv luminol-server/build/libs/$project_id-paperclip-$grdversion-mojmap.jar $jarName_dir
-mv luminol-server/build/libs/$project_id-bundler-$grdversion-mojmap.jar $jarName_bundler_dir
 
 echo "project_id=$project_id" >> $GITHUB_ENV
 echo "project_id_b=$project_id_b" >> $GITHUB_ENV
@@ -28,5 +25,4 @@ echo "pre=$preVersion" >> $GITHUB_ENV
 echo "tag=$release_tag" >> $GITHUB_ENV
 echo "jar=$jarName" >> $GITHUB_ENV
 echo "jar_dir=$jarName_dir" >> $GITHUB_ENV
-echo "jar_dir_bundler=$jarName_bundler_dir" >> $GITHUB_ENV
 echo "make_latest=$make_latest" >> $GITHUB_ENV