diff --git a/lophine-server/minecraft-patches/features/0014-Old-leader-zombie-health-logic.patch b/lophine-server/minecraft-patches/features/0014-Old-leader-zombie-health-logic.patch new file mode 100644 index 0000000..d9dceee --- /dev/null +++ b/lophine-server/minecraft-patches/features/0014-Old-leader-zombie-health-logic.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Helvetica Volubi +Date: Thu, 2 Jul 2026 18:49:40 +0800 +Subject: [PATCH] Old leader zombie health logic + + +diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java +index 2734ffc103ee4760d3521609fdd090ab99df675b..a99683d341f52139003dfa5190ee118d5b06f59f 100644 +--- a/net/minecraft/world/entity/monster/zombie/Zombie.java ++++ b/net/minecraft/world/entity/monster/zombie/Zombie.java +@@ -597,7 +597,7 @@ public class Zombie extends Monster { + .addOrReplacePermanentModifier( + new AttributeModifier(LEADER_ZOMBIE_BONUS_ID, this.random.nextDouble() * 3.0 + 1.0, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL) + ); +- if (spawnReason != EntitySpawnReason.CONVERSION && spawnReason != EntitySpawnReason.LOAD && spawnReason != EntitySpawnReason.DIMENSION_TRAVEL) { ++ if (!fun.bm.lophine.config.modules.function.OldFeatureConfig.oldLeaderZombieHealth && spawnReason != EntitySpawnReason.CONVERSION && spawnReason != EntitySpawnReason.LOAD && spawnReason != EntitySpawnReason.DIMENSION_TRAVEL) { // Lophine - Configurable option to disable health boost for leader zombies + this.setHealth(this.getMaxHealth()); + } + diff --git a/lophine-server/minecraft-patches/features/0014-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0015-Spawn-invulnerable-time.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0014-Spawn-invulnerable-time.patch rename to lophine-server/minecraft-patches/features/0015-Spawn-invulnerable-time.patch diff --git a/lophine-server/minecraft-patches/features/0015-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0016-Leaves-Item-overstack-util.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0015-Leaves-Item-overstack-util.patch rename to lophine-server/minecraft-patches/features/0016-Leaves-Item-overstack-util.patch diff --git a/lophine-server/minecraft-patches/features/0016-Leaves-Old-raid-behavior.patch b/lophine-server/minecraft-patches/features/0017-Leaves-Old-raid-behavior.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0016-Leaves-Old-raid-behavior.patch rename to lophine-server/minecraft-patches/features/0017-Leaves-Old-raid-behavior.patch diff --git a/lophine-server/minecraft-patches/features/0017-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch b/lophine-server/minecraft-patches/features/0018-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0017-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch rename to lophine-server/minecraft-patches/features/0018-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch diff --git a/lophine-server/minecraft-patches/features/0018-Leaves-Leaves-Base-Protocol-Core.patch b/lophine-server/minecraft-patches/features/0019-Leaves-Leaves-Base-Protocol-Core.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0018-Leaves-Leaves-Base-Protocol-Core.patch rename to lophine-server/minecraft-patches/features/0019-Leaves-Leaves-Base-Protocol-Core.patch diff --git a/lophine-server/minecraft-patches/features/0019-Leaves-Configurable-trading-with-the-void.patch b/lophine-server/minecraft-patches/features/0020-Leaves-Configurable-trading-with-the-void.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0019-Leaves-Configurable-trading-with-the-void.patch rename to lophine-server/minecraft-patches/features/0020-Leaves-Configurable-trading-with-the-void.patch diff --git a/lophine-server/minecraft-patches/features/0020-Leaves-Servux-Protocol.patch b/lophine-server/minecraft-patches/features/0021-Leaves-Servux-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0020-Leaves-Servux-Protocol.patch rename to lophine-server/minecraft-patches/features/0021-Leaves-Servux-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0021-LeavesHooks.patch b/lophine-server/minecraft-patches/features/0022-LeavesHooks.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0021-LeavesHooks.patch rename to lophine-server/minecraft-patches/features/0022-LeavesHooks.patch diff --git a/lophine-server/minecraft-patches/features/0022-Leaves-Old-Explosion-Damage-Calculator.patch b/lophine-server/minecraft-patches/features/0023-Leaves-Old-Explosion-Damage-Calculator.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0022-Leaves-Old-Explosion-Damage-Calculator.patch rename to lophine-server/minecraft-patches/features/0023-Leaves-Old-Explosion-Damage-Calculator.patch diff --git a/lophine-server/minecraft-patches/features/0023-Leaves-Redstone-Shears-Wrench.patch b/lophine-server/minecraft-patches/features/0024-Leaves-Redstone-Shears-Wrench.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0023-Leaves-Redstone-Shears-Wrench.patch rename to lophine-server/minecraft-patches/features/0024-Leaves-Redstone-Shears-Wrench.patch diff --git a/lophine-server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch b/lophine-server/minecraft-patches/features/0025-Leaves-Syncmatica-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch rename to lophine-server/minecraft-patches/features/0025-Leaves-Syncmatica-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0025-Leaves-BBOR-Protocol.patch b/lophine-server/minecraft-patches/features/0026-Leaves-BBOR-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0025-Leaves-BBOR-Protocol.patch rename to lophine-server/minecraft-patches/features/0026-Leaves-BBOR-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0026-Leaves-Xaero-Map-Protocol.patch b/lophine-server/minecraft-patches/features/0027-Leaves-Xaero-Map-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0026-Leaves-Xaero-Map-Protocol.patch rename to lophine-server/minecraft-patches/features/0027-Leaves-Xaero-Map-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0027-Leaves-Support-REI-protocol.patch b/lophine-server/minecraft-patches/features/0028-Leaves-Support-REI-protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0027-Leaves-Support-REI-protocol.patch rename to lophine-server/minecraft-patches/features/0028-Leaves-Support-REI-protocol.patch diff --git a/lophine-server/minecraft-patches/features/0028-Leaves-Jade-Protocol.patch b/lophine-server/minecraft-patches/features/0029-Leaves-Jade-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0028-Leaves-Jade-Protocol.patch rename to lophine-server/minecraft-patches/features/0029-Leaves-Jade-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0029-Leaves-Alternative-block-placement-Protocol.patch b/lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0029-Leaves-Alternative-block-placement-Protocol.patch rename to lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0030-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0031-Leaves-Fakeplayer.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0030-Leaves-Fakeplayer.patch rename to lophine-server/minecraft-patches/features/0031-Leaves-Fakeplayer.patch diff --git a/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch b/lophine-server/minecraft-patches/features/0032-Leaves-Replay-Mod-API.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch rename to lophine-server/minecraft-patches/features/0032-Leaves-Replay-Mod-API.patch diff --git a/lophine-server/minecraft-patches/features/0032-Leaves-Creative-fly-no-clip.patch b/lophine-server/minecraft-patches/features/0033-Leaves-Creative-fly-no-clip.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0032-Leaves-Creative-fly-no-clip.patch rename to lophine-server/minecraft-patches/features/0033-Leaves-Creative-fly-no-clip.patch diff --git a/lophine-server/minecraft-patches/features/0033-Leaves-Wool-Hopper-Counter.patch b/lophine-server/minecraft-patches/features/0034-Leaves-Wool-Hopper-Counter.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0033-Leaves-Wool-Hopper-Counter.patch rename to lophine-server/minecraft-patches/features/0034-Leaves-Wool-Hopper-Counter.patch diff --git a/lophine-server/minecraft-patches/features/0034-Global-Entities-Counter.patch b/lophine-server/minecraft-patches/features/0035-Global-Entities-Counter.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0034-Global-Entities-Counter.patch rename to lophine-server/minecraft-patches/features/0035-Global-Entities-Counter.patch diff --git a/lophine-server/minecraft-patches/features/0035-Leaves-Catch-update-suppression-crash.patch b/lophine-server/minecraft-patches/features/0036-Leaves-Catch-update-suppression-crash.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0035-Leaves-Catch-update-suppression-crash.patch rename to lophine-server/minecraft-patches/features/0036-Leaves-Catch-update-suppression-crash.patch diff --git a/lophine-server/minecraft-patches/features/0036-Leaves-CCE-update-suppression.patch b/lophine-server/minecraft-patches/features/0037-Leaves-CCE-update-suppression.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0036-Leaves-CCE-update-suppression.patch rename to lophine-server/minecraft-patches/features/0037-Leaves-CCE-update-suppression.patch diff --git a/lophine-server/minecraft-patches/features/0037-Leaves-Redstone-ignore-upwards-update.patch b/lophine-server/minecraft-patches/features/0038-Leaves-Redstone-ignore-upwards-update.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0037-Leaves-Redstone-ignore-upwards-update.patch rename to lophine-server/minecraft-patches/features/0038-Leaves-Redstone-ignore-upwards-update.patch diff --git a/lophine-server/minecraft-patches/features/0038-Instant-Block-Updater.patch b/lophine-server/minecraft-patches/features/0039-Instant-Block-Updater.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0038-Instant-Block-Updater.patch rename to lophine-server/minecraft-patches/features/0039-Instant-Block-Updater.patch diff --git a/lophine-server/minecraft-patches/features/0039-Revert-TrapDoorBlock-changes-form-Paper.patch b/lophine-server/minecraft-patches/features/0040-Revert-TrapDoorBlock-changes-form-Paper.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0039-Revert-TrapDoorBlock-changes-form-Paper.patch rename to lophine-server/minecraft-patches/features/0040-Revert-TrapDoorBlock-changes-form-Paper.patch diff --git a/lophine-server/minecraft-patches/features/0040-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch b/lophine-server/minecraft-patches/features/0041-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0040-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch rename to lophine-server/minecraft-patches/features/0041-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch diff --git a/lophine-server/minecraft-patches/features/0041-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch b/lophine-server/minecraft-patches/features/0042-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0041-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch rename to lophine-server/minecraft-patches/features/0042-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch diff --git a/lophine-server/minecraft-patches/features/0042-Leaves-Old-Block-remove-behaviour.patch b/lophine-server/minecraft-patches/features/0043-Leaves-Old-Block-remove-behaviour.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0042-Leaves-Old-Block-remove-behaviour.patch rename to lophine-server/minecraft-patches/features/0043-Leaves-Old-Block-remove-behaviour.patch diff --git a/lophine-server/minecraft-patches/features/0043-MiniTweaks-mob-fire-and-explosion-rules.patch b/lophine-server/minecraft-patches/features/0044-MiniTweaks-mob-fire-and-explosion-rules.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0043-MiniTweaks-mob-fire-and-explosion-rules.patch rename to lophine-server/minecraft-patches/features/0044-MiniTweaks-mob-fire-and-explosion-rules.patch diff --git a/lophine-server/minecraft-patches/features/0044-Carpet-features.patch b/lophine-server/minecraft-patches/features/0045-Carpet-features.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0044-Carpet-features.patch rename to lophine-server/minecraft-patches/features/0045-Carpet-features.patch diff --git a/lophine-server/minecraft-patches/features/0045-Carpet-Features-Compatible.patch b/lophine-server/minecraft-patches/features/0046-Carpet-Features-Compatible.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0045-Carpet-Features-Compatible.patch rename to lophine-server/minecraft-patches/features/0046-Carpet-Features-Compatible.patch diff --git a/lophine-server/minecraft-patches/features/0046-PCA-sync-protocol.patch b/lophine-server/minecraft-patches/features/0047-PCA-sync-protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0046-PCA-sync-protocol.patch rename to lophine-server/minecraft-patches/features/0047-PCA-sync-protocol.patch diff --git a/lophine-server/minecraft-patches/features/0047-Add-Vanilla-like-experience-Config.patch b/lophine-server/minecraft-patches/features/0048-Add-Vanilla-like-experience-Config.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0047-Add-Vanilla-like-experience-Config.patch rename to lophine-server/minecraft-patches/features/0048-Add-Vanilla-like-experience-Config.patch diff --git a/lophine-server/minecraft-patches/features/0048-Restore-vanilla-ender-pearl-loading.patch b/lophine-server/minecraft-patches/features/0049-Restore-vanilla-ender-pearl-loading.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0048-Restore-vanilla-ender-pearl-loading.patch rename to lophine-server/minecraft-patches/features/0049-Restore-vanilla-ender-pearl-loading.patch diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/OldFeatureConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/OldFeatureConfig.java index 30f6ba3..1212125 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/OldFeatureConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/OldFeatureConfig.java @@ -13,6 +13,9 @@ public class OldFeatureConfig implements IConfigModule { @ConfigInfo(name = "old_zombie_reinforcement") public static boolean oldZombieReinforcement = false; + @ConfigInfo(name = "old_leader_zombie_health") + public static boolean oldLeaderZombieHealth = false; + @ConfigInfo(name = "old_explosion_damage_calculator") public static boolean oldExplosionDamageCalculator = false;