From 5567b194d73e79a2e84835e9996e96341895f20b Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Wed, 3 Jun 2026 13:57:27 +0800 Subject: [PATCH] update file's sign & add update suppression event to Leaves Features Manager --- .../0006-Update-suppression-event.patch | 18 ++++++++++++++++++ ...atures.patch => 0007-Carpet-features.patch} | 0 ...Leaves-Catch-update-suppression-crash.patch | 2 +- .../0035-Leaves-CCE-update-suppression.patch | 2 +- ...Leaves-Redstone-ignore-upwards-update.patch | 2 +- .../features/0037-Instant-Block-Updater.patch | 4 ++-- ...vert-TrapDoorBlock-changes-form-Paper.patch | 4 ++-- ...loss-of-item-drops-due-to-update-supp.patch | 4 ++-- ...eset-placed-block-on-exception-Do-not.patch | 4 ++-- ...niTweaks-mob-fire-and-explosion-rules.patch | 5 ++++- .../carpet/config/modules/CoreConfig.java | 2 -- .../modules/experiment/RedStoneConfig.java | 1 - 12 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 lophine-server/luminol-patches/features/0006-Update-suppression-event.patch rename lophine-server/luminol-patches/features/{0006-Carpet-features.patch => 0007-Carpet-features.patch} (100%) diff --git a/lophine-server/luminol-patches/features/0006-Update-suppression-event.patch b/lophine-server/luminol-patches/features/0006-Update-suppression-event.patch new file mode 100644 index 0000000..ef3ff25 --- /dev/null +++ b/lophine-server/luminol-patches/features/0006-Update-suppression-event.patch @@ -0,0 +1,18 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Helvetica Volubi +Date: Wed, 3 Jun 2026 13:49:39 +0800 +Subject: [PATCH] Update suppression event + + +diff --git a/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java b/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java +index 1f3fe7f786bb8f7c59e3a0235dcc572f3171ee6b..5bae7e78f4b16f399e261d95527ba9f40b0e90c4 100644 +--- a/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java ++++ b/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java +@@ -13,6 +13,7 @@ public class ServerFeatureManager implements FeatureManager { + private ServerFeatureManager() { + availableFeatures.add(FAKEPLAYER); // Lophine - fakeplayer support + availableFeatures.add(PHOTOGRAPHER); // Lophine - Replay Mod API support ++ availableFeatures.add(UPDATE_SUPPRESSION_EVENT); // Lophine - update suppression event support + if (Boolean.getBoolean("leavesclip.enable.mixin")) { + availableFeatures.add(MIXIN); + } diff --git a/lophine-server/luminol-patches/features/0006-Carpet-features.patch b/lophine-server/luminol-patches/features/0007-Carpet-features.patch similarity index 100% rename from lophine-server/luminol-patches/features/0006-Carpet-features.patch rename to lophine-server/luminol-patches/features/0007-Carpet-features.patch diff --git a/lophine-server/minecraft-patches/features/0034-Leaves-Catch-update-suppression-crash.patch b/lophine-server/minecraft-patches/features/0034-Leaves-Catch-update-suppression-crash.patch index 5928055..a9cba66 100644 --- a/lophine-server/minecraft-patches/features/0034-Leaves-Catch-update-suppression-crash.patch +++ b/lophine-server/minecraft-patches/features/0034-Leaves-Catch-update-suppression-crash.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bacteriawa -Date: Tue, 2 Jun 2026 19:55:06 +0800 +Date: Sat, 7 Feb 2026 23:57:50 +0800 Subject: [PATCH] Leaves: Catch update suppression crash Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com> diff --git a/lophine-server/minecraft-patches/features/0035-Leaves-CCE-update-suppression.patch b/lophine-server/minecraft-patches/features/0035-Leaves-CCE-update-suppression.patch index f7d627d..a4e377e 100644 --- a/lophine-server/minecraft-patches/features/0035-Leaves-CCE-update-suppression.patch +++ b/lophine-server/minecraft-patches/features/0035-Leaves-CCE-update-suppression.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bacteriawa -Date: Tue, 2 Jun 2026 20:06:33 +0800 +Date: Sat, 15 Nov 2025 01:12:39 +0800 Subject: [PATCH] Leaves: CCE update suppression Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com> diff --git a/lophine-server/minecraft-patches/features/0036-Leaves-Redstone-ignore-upwards-update.patch b/lophine-server/minecraft-patches/features/0036-Leaves-Redstone-ignore-upwards-update.patch index c1067f2..2e005c5 100644 --- a/lophine-server/minecraft-patches/features/0036-Leaves-Redstone-ignore-upwards-update.patch +++ b/lophine-server/minecraft-patches/features/0036-Leaves-Redstone-ignore-upwards-update.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bacteriawa -Date: Tue, 2 Jun 2026 20:15:44 +0800 +Date: Wed, 14 Jun 2023 12:07:07 +0800 Subject: [PATCH] Leaves: Redstone ignore upwards update Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com> diff --git a/lophine-server/minecraft-patches/features/0037-Instant-Block-Updater.patch b/lophine-server/minecraft-patches/features/0037-Instant-Block-Updater.patch index 465af7a..8c4d1b3 100644 --- a/lophine-server/minecraft-patches/features/0037-Instant-Block-Updater.patch +++ b/lophine-server/minecraft-patches/features/0037-Instant-Block-Updater.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bacteriawa -Date: Tue, 2 Jun 2026 20:32:47 +0800 +From: Helvetica Volubi +Date: Mon, 17 Nov 2025 18:41:08 +0800 Subject: [PATCH] Instant Block Updater diff --git a/lophine-server/minecraft-patches/features/0038-Revert-TrapDoorBlock-changes-form-Paper.patch b/lophine-server/minecraft-patches/features/0038-Revert-TrapDoorBlock-changes-form-Paper.patch index e398f6d..f3b0a76 100644 --- a/lophine-server/minecraft-patches/features/0038-Revert-TrapDoorBlock-changes-form-Paper.patch +++ b/lophine-server/minecraft-patches/features/0038-Revert-TrapDoorBlock-changes-form-Paper.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bacteriawa -Date: Tue, 2 Jun 2026 20:37:27 +0800 +From: Helvetica Volubi +Date: Tue, 18 Nov 2025 00:24:32 +0800 Subject: [PATCH] Revert TrapDoorBlock changes form Paper diff --git a/lophine-server/minecraft-patches/features/0039-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch b/lophine-server/minecraft-patches/features/0039-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch index b99add7..81abc43 100644 --- a/lophine-server/minecraft-patches/features/0039-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch +++ b/lophine-server/minecraft-patches/features/0039-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bacteriawa -Date: Tue, 2 Jun 2026 20:42:45 +0800 +From: Helvetica Volubi +Date: Tue, 18 Nov 2025 00:35:13 +0800 Subject: [PATCH] Leaves: Prevent loss of item drops due to update suppression when breaking blocks diff --git a/lophine-server/minecraft-patches/features/0040-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch b/lophine-server/minecraft-patches/features/0040-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch index 90962a7..1f357e9 100644 --- a/lophine-server/minecraft-patches/features/0040-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch +++ b/lophine-server/minecraft-patches/features/0040-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bacteriawa -Date: Tue, 2 Jun 2026 20:50:57 +0800 +From: Helvetica Volubi +Date: Tue, 18 Nov 2025 23:26:27 +0800 Subject: [PATCH] Leaves: Do not reset placed block on exception & Do not prevent block entity and entity crash at LevelChunk diff --git a/lophine-server/minecraft-patches/features/0043-MiniTweaks-mob-fire-and-explosion-rules.patch b/lophine-server/minecraft-patches/features/0043-MiniTweaks-mob-fire-and-explosion-rules.patch index 8fafeae..4abc018 100644 --- a/lophine-server/minecraft-patches/features/0043-MiniTweaks-mob-fire-and-explosion-rules.patch +++ b/lophine-server/minecraft-patches/features/0043-MiniTweaks-mob-fire-and-explosion-rules.patch @@ -5,9 +5,10 @@ Subject: [PATCH] MiniTweaks mob fire and explosion rules diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java +index 5005f2b923aa94dbc38fb75d5b6f58344888c895..0d4ba81c82b683c32addf6441de3843abf462c3c 100644 --- a/net/minecraft/world/entity/monster/Creeper.java +++ b/net/minecraft/world/entity/monster/Creeper.java -@@ -249,7 +249,8 @@ public class Creeper extends Monster { +@@ -250,7 +250,8 @@ public class Creeper extends Monster { if (!event.isCancelled()) { // CraftBukkit end this.dead = true; @@ -18,6 +19,7 @@ diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/wor this.triggerOnDeathMobEffects(level, Entity.RemovalReason.KILLED); this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause diff --git a/net/minecraft/world/entity/projectile/hurtingprojectile/LargeFireball.java b/net/minecraft/world/entity/projectile/hurtingprojectile/LargeFireball.java +index 711b97aa9e49b7edee34c91d77b1005be4fa96bd..1d9232c9061bde9c545e3ee25bc9c6b0417b9ece 100644 --- a/net/minecraft/world/entity/projectile/hurtingprojectile/LargeFireball.java +++ b/net/minecraft/world/entity/projectile/hurtingprojectile/LargeFireball.java @@ -37,7 +37,9 @@ public class LargeFireball extends Fireball { @@ -32,6 +34,7 @@ diff --git a/net/minecraft/world/entity/projectile/hurtingprojectile/LargeFireba // CraftBukkit end - fire ExplosionPrimeEvent this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause diff --git a/net/minecraft/world/entity/projectile/hurtingprojectile/SmallFireball.java b/net/minecraft/world/entity/projectile/hurtingprojectile/SmallFireball.java +index 1a72ee1559f75660796a9cbc1a9d9cdd6883dc90..480042d9401b6d7618fc2f36f16145606414d475 100644 --- a/net/minecraft/world/entity/projectile/hurtingprojectile/SmallFireball.java +++ b/net/minecraft/world/entity/projectile/hurtingprojectile/SmallFireball.java @@ -63,7 +63,7 @@ public class SmallFireball extends Fireball { diff --git a/lophine-server/src/main/java/fun/bm/lophine/carpet/config/modules/CoreConfig.java b/lophine-server/src/main/java/fun/bm/lophine/carpet/config/modules/CoreConfig.java index 8e1c8c6..fbe3e7c 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/carpet/config/modules/CoreConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/carpet/config/modules/CoreConfig.java @@ -1,7 +1,5 @@ package fun.bm.lophine.carpet.config.modules; -//import fun.bm.lophine.carpet.CarpetCompatSync; - import fun.bm.lophine.carpet.CarpetCompatSync; import me.earthme.luminol.config.IConfigModule; import me.earthme.luminol.config.flags.ConfigClassInfo; diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RedStoneConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RedStoneConfig.java index 8cdc8d3..dce6eaa 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RedStoneConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RedStoneConfig.java @@ -4,7 +4,6 @@ import me.earthme.luminol.config.IConfigModule; import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.HotReloadUnsupported; -import me.earthme.luminol.config.flags.TransformedConfig; import me.earthme.luminol.enums.EnumConfigCategory; /*