refactor: fix up patches

docs: fix an error

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -15,7 +15,7 @@ body:
         如果此bug被尝试修复，您可以帮助我们测试并回复。若bug的确被修复，您可以关闭issue来让开发者确认。
         If this bug is tried to fix, you can help us test and reply. If the bug is fixed, you can close the issue to let the developer confirm.
   - type: input
-    id: leavesMC-version
+    id: luminolMC-version
     attributes:
       label: 服务端版本 LuminolMC Version
       description:

docs/CONTRIBUTING_EN.md

@@ -63,7 +63,7 @@ BTW, `*-api` and `*-server` and are not normal git repositories.
 
 - Before applying patches, the base will point to unmodified source code.
 - Every commit after the base is a patch.
-- Only commits after the last commit of Paper will be considered as Luminol patches.
+- Only commits after the last commit of Folia will be considered as Luminol patches.
 
 ## Adding new patches
 

gradle.properties

@@ -2,7 +2,7 @@ group = me.earthme.luminol
 version=1.21.5-R0.1-SNAPSHOT
 mcVersion=1.21.5
 
-foliaRef=6c77040ff6ad3401687b1fc49f9d0e8e2e09de87
+foliaRef=3aba0068ded3f23bf8fa5cac6c70cb48f1d70478
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

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

@@ -53,3 +53,31 @@ index 76c08499b704a6cb0cb95ce69b9a9248d69cc127..d516595a8675a9f3d9c14658b66160ba
 +    }
 +    // 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 6316a2f1d2dc0314397e33e6dbd354fb8bc50541..6e2d1bf0e8eb9fa4917b464324a02b9b5d0dd496 100644
+--- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
++++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
+@@ -25,6 +25,7 @@ public class PlayerDeathEvent extends EntityDeathEvent {
+     private boolean doExpDrop;
+     private boolean keepLevel = false;
+     private boolean keepInventory = false;
++    private boolean useApiExpDropStatus = false; // Leaves - exp fix
+     @Deprecated
+     private final List<ItemStack> itemsToKeep = new ArrayList<>();
+ 
+@@ -82,8 +83,15 @@ public class PlayerDeathEvent extends EntityDeathEvent {
+         this.showDeathMessages = true;
+         this.deathMessage = LegacyComponentSerializer.legacySection().deserializeOrNull(deathMessage);
+         this.doExpDrop = doExpDrop;
++        this.useApiExpDropStatus = true; // Leaves - exp fix
+     }
+ 
++    // Leaves start - exp fix
++    public boolean forceUseEventDropStatus() {
++        return this.useApiExpDropStatus;
++    }
++    // Leaves end - exp fix
++
+     @NotNull
+     @Override
+     public Player getEntity() {

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

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sat, 24 May 2025 01:47:10 +0800
-Subject: [PATCH] Leaves Fix SculkCatalyst exp skip
-
-
-diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-index 6316a2f1d2dc0314397e33e6dbd354fb8bc50541..6e2d1bf0e8eb9fa4917b464324a02b9b5d0dd496 100644
---- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-@@ -25,6 +25,7 @@ public class PlayerDeathEvent extends EntityDeathEvent {
-     private boolean doExpDrop;
-     private boolean keepLevel = false;
-     private boolean keepInventory = false;
-+    private boolean useApiExpDropStatus = false; // Leaves - exp fix
-     @Deprecated
-     private final List<ItemStack> itemsToKeep = new ArrayList<>();
- 
-@@ -82,8 +83,15 @@ public class PlayerDeathEvent extends EntityDeathEvent {
-         this.showDeathMessages = true;
-         this.deathMessage = LegacyComponentSerializer.legacySection().deserializeOrNull(deathMessage);
-         this.doExpDrop = doExpDrop;
-+        this.useApiExpDropStatus = true; // Leaves - exp fix
-     }
- 
-+    // Leaves start - exp fix
-+    public boolean forceUseEventDropStatus() {
-+        return this.useApiExpDropStatus;
-+    }
-+    // Leaves end - exp fix
-+
-     @NotNull
-     @Override
-     public Player getEntity() {

luminol-server/minecraft-patches/features/0058-Fix-mispatched-entity-custom-spawning-logic.patch

@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Sat, 31 May 2025 16:28:19 +0800
-Subject: [PATCH] Fix mispatched entity custom spawning logic
-
-we should use local players as each tickregion will only foreach their own player entities so that we won't come across async accessing world data
-
-diff --git a/net/minecraft/world/level/levelgen/PhantomSpawner.java b/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index a7f56126a26e1fca86c39d8d656b648f5d6bb4ca..4626ee9f4410d8fd683db17b49ef79ab67eeda5f 100644
---- a/net/minecraft/world/level/levelgen/PhantomSpawner.java
-+++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java
-@@ -40,7 +40,7 @@ public class PhantomSpawner implements CustomSpawner {
-                     worldData.phantomSpawnerNextTick += (spawnAttemptMinSeconds + randomSource.nextInt(spawnAttemptMaxSeconds - spawnAttemptMinSeconds + 1)) * 20; // Folia - region threading
-                     // Paper end - Ability to control player's insomnia and phantoms
-                     if (level.getSkyDarken() >= 5 || !level.dimensionType().hasSkyLight()) {
--                        for (ServerPlayer serverPlayer : level.players()) {
-+                        for (ServerPlayer serverPlayer : level.getLocalPlayers()) { // Luminol - Fix mispatched entity custom spawning logic - Use local players for only the players in current tickregion
-                             if (!serverPlayer.isSpectator() && (!level.paperConfig().entities.behavior.phantomsDoNotSpawnOnCreativePlayers || !serverPlayer.isCreative())) { // Paper - Add phantom creative and insomniac controls
-                                 BlockPos blockPos = serverPlayer.blockPosition();
-                                 if (!level.dimensionType().hasSkyLight() || blockPos.getY() >= level.getSeaLevel() && level.canSeeSky(blockPos)) {