diff --git a/luminol-server/minecraft-patches/features/0013-Add-config-for-watchdog-timeout.patch b/luminol-server/minecraft-patches/features/0010-Add-config-for-watchdog-timeout.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0013-Add-config-for-watchdog-timeout.patch rename to luminol-server/minecraft-patches/features/0010-Add-config-for-watchdog-timeout.patch diff --git a/luminol-server/minecraft-patches/features/0048-Configurable-tripwire-dupe.patch b/luminol-server/minecraft-patches/features/0011-Add-config-for-tripwire-dupe.patch similarity index 96% rename from luminol-server/minecraft-patches/features/0048-Configurable-tripwire-dupe.patch rename to luminol-server/minecraft-patches/features/0011-Add-config-for-tripwire-dupe.patch index 200ded2..688c65a 100644 --- a/luminol-server/minecraft-patches/features/0048-Configurable-tripwire-dupe.patch +++ b/luminol-server/minecraft-patches/features/0011-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 diff --git a/luminol-server/minecraft-patches/features/0011-Add-fix-for-off-region-adult-following-ai-behavior.patch b/luminol-server/minecraft-patches/features/0011-Add-fix-for-off-region-adult-following-ai-behavior.patch deleted file mode 100644 index 48f64a1..0000000 --- a/luminol-server/minecraft-patches/features/0011-Add-fix-for-off-region-adult-following-ai-behavior.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Sun, 12 Jan 2025 10:39:35 +0800 -Subject: [PATCH] Add fix for off region adult following ai behavior - - -diff --git a/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java b/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java -index a9be3acbf4ea52d2988347abfa6f4f8c02b1da26..751f3dde8e6bc2c0365e8672f5079af0379a69de 100644 ---- a/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java -+++ b/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java -@@ -25,6 +25,14 @@ public class BabyFollowAdult { - return false; - } else { - LivingEntity ageableMob = instance.get(nearestVisibleAdult); // CraftBukkit - type -+ -+ // Luminol start - Fix off world entity following which caused async issue -+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(ageableMob)) { -+ nearestVisibleAdult.erase(); -+ return true; -+ } -+ // Luminol end -+ - if (mob.closerThan(ageableMob, followRange.getMaxValue() + 1) && !mob.closerThan(ageableMob, followRange.getMinValue())) { - // CraftBukkit start - org.bukkit.event.entity.EntityTargetLivingEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTargetLivingEvent(mob, ageableMob, org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER); diff --git a/luminol-server/minecraft-patches/features/0010-Add-experiment-config-for-command-block-command-exec.patch b/luminol-server/minecraft-patches/features/0012-Add-experiment-config-for-command-block-command-exec.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0010-Add-experiment-config-for-command-block-command-exec.patch rename to luminol-server/minecraft-patches/features/0012-Add-experiment-config-for-command-block-command-exec.patch diff --git a/luminol-server/minecraft-patches/features/0014-Add-experiment-config-for-entity-to-clean-memory-val.patch b/luminol-server/minecraft-patches/features/0013-Add-experiment-config-for-entity-to-clean-memory-val.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0014-Add-experiment-config-for-entity-to-clean-memory-val.patch rename to luminol-server/minecraft-patches/features/0013-Add-experiment-config-for-entity-to-clean-memory-val.patch diff --git a/luminol-server/minecraft-patches/features/0049-Add-force-the-data-command-to-be-enabled-config.patch b/luminol-server/minecraft-patches/features/0014-Add-experiment-config-for-force-enabling-data-comman.patch similarity index 94% rename from luminol-server/minecraft-patches/features/0049-Add-force-the-data-command-to-be-enabled-config.patch rename to luminol-server/minecraft-patches/features/0014-Add-experiment-config-for-force-enabling-data-comman.patch index edafa34..faa99bf 100644 --- a/luminol-server/minecraft-patches/features/0049-Add-force-the-data-command-to-be-enabled-config.patch +++ b/luminol-server/minecraft-patches/features/0014-Add-experiment-config-for-force-enabling-data-comman.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kercute Date: Sun, 16 Mar 2025 23:31:41 +0800 -Subject: [PATCH] Add force the data command to be enabled config +Subject: [PATCH] Add experiment config for force enabling data command diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java diff --git a/luminol-server/minecraft-patches/features/0012-Add-configurable-region-format-framework-linear-v2-r.patch b/luminol-server/minecraft-patches/features/0015-Add-configurable-region-format-framework-linear-v2-r.patch similarity index 99% rename from luminol-server/minecraft-patches/features/0012-Add-configurable-region-format-framework-linear-v2-r.patch rename to luminol-server/minecraft-patches/features/0015-Add-configurable-region-format-framework-linear-v2-r.patch index e51a8ae..cc33e8d 100644 --- a/luminol-server/minecraft-patches/features/0012-Add-configurable-region-format-framework-linear-v2-r.patch +++ b/luminol-server/minecraft-patches/features/0015-Add-configurable-region-format-framework-linear-v2-r.patch @@ -55,7 +55,7 @@ index 51c126735ace8fdde89ad97b5cab62f244212db0..c7d4d944eb198ac53a3eeae717a25c7d + public void moonrise$write(final abomination.IRegionFile regionFile) throws IOException; // Luminol - Configurable region file format } diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index f2124edb487b1d5f6bdc7fa086814f870724363a..ed00a29daccfee1d631bef27c0a3a4ae83140018 100644 +index fc088edaa36e7e68ddd23c57e351ef3b31ed5ad8..5d709b3b47702e7607dafa4a38380c801b228e2d 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -986,10 +986,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 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(); } diff --git a/luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch b/luminol-server/paper-patches/features/0005-Force-disable-builtin-spark-plugin.patch similarity index 97% rename from luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch rename to luminol-server/paper-patches/features/0005-Force-disable-builtin-spark-plugin.patch index 7fa5cbd..c8e30c2 100644 --- a/luminol-server/paper-patches/features/0006-Force-disable-builtin-spark-plugin.patch +++ b/luminol-server/paper-patches/features/0005-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 935ac76cec67ea661a392ff02396aa7aefd56268..58275b09c75b9913c2249c5c8190027143121070 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 { diff --git a/luminol-server/paper-patches/features/0005-Purpur-Lobotomize-stuck-villagers.patch b/luminol-server/paper-patches/features/0006-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from luminol-server/paper-patches/features/0005-Purpur-Lobotomize-stuck-villagers.patch rename to luminol-server/paper-patches/features/0006-Purpur-Lobotomize-stuck-villagers.patch diff --git a/luminol-server/paper-patches/features/0011-Purpur-Barrels-and-enderchests-6-rows.patch b/luminol-server/paper-patches/features/0007-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from luminol-server/paper-patches/features/0011-Purpur-Barrels-and-enderchests-6-rows.patch rename to luminol-server/paper-patches/features/0007-Purpur-Barrels-and-enderchests-6-rows.patch diff --git a/luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/paper-patches/features/0008-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from luminol-server/paper-patches/features/0007-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/paper-patches/features/0008-SparklyPaper-Optimize-canSee-checks.patch diff --git a/luminol-server/paper-patches/features/0008-Leaf-Skip-event-if-no-listeners.patch b/luminol-server/paper-patches/features/0009-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from luminol-server/paper-patches/features/0008-Leaf-Skip-event-if-no-listeners.patch rename to luminol-server/paper-patches/features/0009-Leaf-Skip-event-if-no-listeners.patch diff --git a/luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/paper-patches/features/0010-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 96% rename from luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/paper-patches/features/0010-Leaf-Secure-seed-and-matter-seed-command.patch index 69ee59f..28ef1ba 100644 --- a/luminol-server/paper-patches/features/0009-Leaf-Secure-seed-and-matter-seed-command.patch +++ b/luminol-server/paper-patches/features/0010-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 58275b09c75b9913c2249c5c8190027143121070..cb406334c316aaf7fc66060b90781eaace883c01 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 { diff --git a/luminol-server/paper-patches/features/0010-Tick-regions-api.patch b/luminol-server/paper-patches/features/0011-Tick-regions-api.patch similarity index 100% rename from luminol-server/paper-patches/features/0010-Tick-regions-api.patch rename to luminol-server/paper-patches/features/0011-Tick-regions-api.patch