diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 3f7a879..212c3a6 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.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:
diff --git a/docs/CONTRIBUTING_EN.md b/docs/CONTRIBUTING_EN.md
index 9fc3e8d..76d5100 100644
--- a/docs/CONTRIBUTING_EN.md
+++ b/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
 
diff --git a/luminol-api/paper-patches/features/0008-Leaves-Fix-SculkCatalyst-exp-skip.patch b/luminol-api/paper-patches/features/0008-Leaves-Fix-SculkCatalyst-exp-skip.patch
index cc34a68..b15fd9d 100644
--- a/luminol-api/paper-patches/features/0008-Leaves-Fix-SculkCatalyst-exp-skip.patch
+++ b/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() {
diff --git a/luminol-api/paper-patches/features/0011-Leaves-Fix-SculkCatalyst-exp-skip.patch b/luminol-api/paper-patches/features/0011-Leaves-Fix-SculkCatalyst-exp-skip.patch
deleted file mode 100644
index 90fb9a6..0000000
--- a/luminol-api/paper-patches/features/0011-Leaves-Fix-SculkCatalyst-exp-skip.patch
+++ /dev/null
@@ -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() {