diff --git a/leaves-server/minecraft-patches/features/0123-Old-nether-portal-collision.patch b/leaves-server/minecraft-patches/features/0123-Old-nether-portal-collision.patch deleted file mode 100644 index 5eb752b8..00000000 --- a/leaves-server/minecraft-patches/features/0123-Old-nether-portal-collision.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Helvetica Volubi -Date: Sun, 18 May 2025 23:48:59 +0800 -Subject: [PATCH] Old nether portal collision - -It will be removed in 1.21.6 mojang revert it again. - -diff --git a/net/minecraft/world/level/block/NetherPortalBlock.java b/net/minecraft/world/level/block/NetherPortalBlock.java -index 3aabae6e27e692aa65cc931e57306426e0f4d645..76dc4eb719244f002e327919c6b8aac8b359b5f0 100644 ---- a/net/minecraft/world/level/block/NetherPortalBlock.java -+++ b/net/minecraft/world/level/block/NetherPortalBlock.java -@@ -60,7 +60,7 @@ public class NetherPortalBlock extends Block implements Portal { - - @Override - protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { -- return SHAPES.get(state.getValue(AXIS)); -+ return org.leavesmc.leaves.LeavesConfig.modify.oldMC.oldNetherPortalCollision ? Shapes.block() : SHAPES.get(state.getValue(AXIS)); // Leaves - Old nether portal collision - } - - @Override diff --git a/leaves-server/minecraft-patches/features/0124-Spawn-invulnerable-time.patch b/leaves-server/minecraft-patches/features/0123-Spawn-invulnerable-time.patch similarity index 95% rename from leaves-server/minecraft-patches/features/0124-Spawn-invulnerable-time.patch rename to leaves-server/minecraft-patches/features/0123-Spawn-invulnerable-time.patch index 0cc80c89..6c59def5 100644 --- a/leaves-server/minecraft-patches/features/0124-Spawn-invulnerable-time.patch +++ b/leaves-server/minecraft-patches/features/0123-Spawn-invulnerable-time.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn invulnerable time diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index cd7dd412ab714fe0dc3f180a2dee1b3547292a81..18de3e99b83a7e2ecf018456ee51361b06d6451b 100644 +index 42d74e0d393b13ae44fde24f0b75464ad00818b7..7a86ba7684259a7e007021dceaad4e735a0ccc07 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -232,6 +232,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/leaves-server/minecraft-patches/features/0125-Old-zombie-reinforcement.patch b/leaves-server/minecraft-patches/features/0124-Old-zombie-reinforcement.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0125-Old-zombie-reinforcement.patch rename to leaves-server/minecraft-patches/features/0124-Old-zombie-reinforcement.patch diff --git a/leaves-server/minecraft-patches/features/0126-Sound-update-suppression.patch b/leaves-server/minecraft-patches/features/0125-Sound-update-suppression.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0126-Sound-update-suppression.patch rename to leaves-server/minecraft-patches/features/0125-Sound-update-suppression.patch diff --git a/leaves-server/minecraft-patches/features/0127-Old-zombie-piglin-drop-behavior.patch b/leaves-server/minecraft-patches/features/0126-Old-zombie-piglin-drop-behavior.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0127-Old-zombie-piglin-drop-behavior.patch rename to leaves-server/minecraft-patches/features/0126-Old-zombie-piglin-drop-behavior.patch diff --git a/leaves-server/minecraft-patches/features/0128-Fast-exp-orb-absorb.patch b/leaves-server/minecraft-patches/features/0127-Fast-exp-orb-absorb.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0128-Fast-exp-orb-absorb.patch rename to leaves-server/minecraft-patches/features/0127-Fast-exp-orb-absorb.patch diff --git a/leaves-server/minecraft-patches/features/0129-Vanilla-Fluid-Pushing.patch b/leaves-server/minecraft-patches/features/0128-Vanilla-Fluid-Pushing.patch similarity index 97% rename from leaves-server/minecraft-patches/features/0129-Vanilla-Fluid-Pushing.patch rename to leaves-server/minecraft-patches/features/0128-Vanilla-Fluid-Pushing.patch index f1794616..afba3d61 100644 --- a/leaves-server/minecraft-patches/features/0129-Vanilla-Fluid-Pushing.patch +++ b/leaves-server/minecraft-patches/features/0128-Vanilla-Fluid-Pushing.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Vanilla Fluid Pushing diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 34e71d35a28954d9cb13a349de09f1303cdd11b8..096aee98257f24ce187682c256d80b0b13611339 100644 +index 0a29cf071cefe14f1862d4bd5ddcacff42fe9f15..05770bb17a37733c83464e1c90ce549d5e7771c5 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -4729,8 +4729,82 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaves-server/minecraft-patches/features/0130-Configurable-item-damage-check.patch b/leaves-server/minecraft-patches/features/0129-Configurable-item-damage-check.patch similarity index 92% rename from leaves-server/minecraft-patches/features/0130-Configurable-item-damage-check.patch rename to leaves-server/minecraft-patches/features/0129-Configurable-item-damage-check.patch index 9d074978..8767e590 100644 --- a/leaves-server/minecraft-patches/features/0130-Configurable-item-damage-check.patch +++ b/leaves-server/minecraft-patches/features/0129-Configurable-item-damage-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item damage check diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java -index 72f084ebb61ca5b93ddf75e9a14cc8106f908a5f..1356af3e5dfeb9f3a3bb1bcff9109d49c795729d 100644 +index 3ba64f91883b88f3131d4582c771b511bbccfcd9..73c1972470ef19fe7fff0ed17d6ff40fe8bed38b 100644 --- a/net/minecraft/world/item/ItemStack.java +++ b/net/minecraft/world/item/ItemStack.java @@ -597,11 +597,11 @@ public final class ItemStack implements DataComponentHolder { diff --git a/leaves-server/minecraft-patches/features/0131-Old-Throwable-Projectile-tick-order.patch b/leaves-server/minecraft-patches/features/0130-Old-Throwable-Projectile-tick-order.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0131-Old-Throwable-Projectile-tick-order.patch rename to leaves-server/minecraft-patches/features/0130-Old-Throwable-Projectile-tick-order.patch diff --git a/leaves-server/minecraft-patches/features/0132-Old-leash-behavior-when-use-firework.patch b/leaves-server/minecraft-patches/features/0131-Old-leash-behavior-when-use-firework.patch similarity index 94% rename from leaves-server/minecraft-patches/features/0132-Old-leash-behavior-when-use-firework.patch rename to leaves-server/minecraft-patches/features/0131-Old-leash-behavior-when-use-firework.patch index 6f174208..0a45ffec 100644 --- a/leaves-server/minecraft-patches/features/0132-Old-leash-behavior-when-use-firework.patch +++ b/leaves-server/minecraft-patches/features/0131-Old-leash-behavior-when-use-firework.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Old leash behavior when use firework diff --git a/net/minecraft/world/item/FireworkRocketItem.java b/net/minecraft/world/item/FireworkRocketItem.java -index c3ae57d515ca1879c5f278097435b7308436c579..9f54698ecd92ca9514ce10bc59356bcc21f77604 100644 +index 0e4335bb2469a4698b303b598ec773b5c7cc73ce..1a514f09873c9249a1d7ad77c8cd2d647d24772f 100644 --- a/net/minecraft/world/item/FireworkRocketItem.java +++ b/net/minecraft/world/item/FireworkRocketItem.java @@ -87,7 +87,7 @@ public class FireworkRocketItem extends Item implements ProjectileItem { diff --git a/leaves-server/minecraft-patches/features/0133-Old-wet-tnt-explode-behavior.patch b/leaves-server/minecraft-patches/features/0132-Old-wet-tnt-explode-behavior.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0133-Old-wet-tnt-explode-behavior.patch rename to leaves-server/minecraft-patches/features/0132-Old-wet-tnt-explode-behavior.patch diff --git a/leaves-server/minecraft-patches/features/0134-Old-projectile-explosion-behavior.patch b/leaves-server/minecraft-patches/features/0133-Old-projectile-explosion-behavior.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0134-Old-projectile-explosion-behavior.patch rename to leaves-server/minecraft-patches/features/0133-Old-projectile-explosion-behavior.patch diff --git a/leaves-server/minecraft-patches/features/0135-Prevent-loss-of-item-drops-due-to-update-suppression.patch b/leaves-server/minecraft-patches/features/0134-Prevent-loss-of-item-drops-due-to-update-suppression.patch similarity index 95% rename from leaves-server/minecraft-patches/features/0135-Prevent-loss-of-item-drops-due-to-update-suppression.patch rename to leaves-server/minecraft-patches/features/0134-Prevent-loss-of-item-drops-due-to-update-suppression.patch index ef63bbbb..3ea85f05 100644 --- a/leaves-server/minecraft-patches/features/0135-Prevent-loss-of-item-drops-due-to-update-suppression.patch +++ b/leaves-server/minecraft-patches/features/0134-Prevent-loss-of-item-drops-due-to-update-suppression.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent loss of item drops due to update suppression when diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java -index 48bb795216ca3fb301813080de403a048bbfa98c..711ae193ea96fd9c4cbba16a49a450444496abf1 100644 +index f258bc30014f94243ad832b33dcb6c9acd1f2f08..a3934a0edd210af1ca4749ea64d050871cbfc96d 100644 --- a/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/net/minecraft/server/level/ServerPlayerGameMode.java @@ -382,7 +382,14 @@ public class ServerPlayerGameMode { diff --git a/leaves-server/minecraft-patches/features/0136-Fix-block-place-desync-due-to-update-suppression.patch b/leaves-server/minecraft-patches/features/0135-Fix-block-place-desync-due-to-update-suppression.patch similarity index 93% rename from leaves-server/minecraft-patches/features/0136-Fix-block-place-desync-due-to-update-suppression.patch rename to leaves-server/minecraft-patches/features/0135-Fix-block-place-desync-due-to-update-suppression.patch index 1f3875ec..b3a5e897 100644 --- a/leaves-server/minecraft-patches/features/0136-Fix-block-place-desync-due-to-update-suppression.patch +++ b/leaves-server/minecraft-patches/features/0135-Fix-block-place-desync-due-to-update-suppression.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix block place desync due to update suppression diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java -index 1356af3e5dfeb9f3a3bb1bcff9109d49c795729d..c5ced8acc1c1f1a6b1082f3deee990d1a8a8c677 100644 +index 73c1972470ef19fe7fff0ed17d6ff40fe8bed38b..fdc92174fcb4f56fb4ff056f04c9b2429061d887 100644 --- a/net/minecraft/world/item/ItemStack.java +++ b/net/minecraft/world/item/ItemStack.java @@ -389,8 +389,12 @@ public final class ItemStack implements DataComponentHolder { diff --git a/leaves-server/minecraft-patches/features/0137-temp-fix-quick-craft.patch b/leaves-server/minecraft-patches/features/0136-temp-fix-quick-craft.patch similarity index 92% rename from leaves-server/minecraft-patches/features/0137-temp-fix-quick-craft.patch rename to leaves-server/minecraft-patches/features/0136-temp-fix-quick-craft.patch index e4643532..f983d182 100644 --- a/leaves-server/minecraft-patches/features/0137-temp-fix-quick-craft.patch +++ b/leaves-server/minecraft-patches/features/0136-temp-fix-quick-craft.patch @@ -7,7 +7,7 @@ caused by PaperMC/Paper#11765 should remove when PaperMC/Paper#11831 merged diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index b33c78f836830dd47e275cab9c9f87531152a96b..fb6aeb0838bdf8a9b1ed406eaaa59cff6e13a855 100644 +index 7cab027953d92b89ea6233b15491e07f24fb9519..72ac89d349db718125cfb9aac6453c2cba708919 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -3945,11 +3945,11 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaves-server/minecraft-patches/features/0138-Old-ender-dragon-part-can-use-end-portal.patch b/leaves-server/minecraft-patches/features/0137-Old-ender-dragon-part-can-use-end-portal.patch similarity index 98% rename from leaves-server/minecraft-patches/features/0138-Old-ender-dragon-part-can-use-end-portal.patch rename to leaves-server/minecraft-patches/features/0137-Old-ender-dragon-part-can-use-end-portal.patch index 3e4a69ee..f79c2106 100644 --- a/leaves-server/minecraft-patches/features/0138-Old-ender-dragon-part-can-use-end-portal.patch +++ b/leaves-server/minecraft-patches/features/0137-Old-ender-dragon-part-can-use-end-portal.patch @@ -26,7 +26,7 @@ This patch is Powered by CrystalCarpetAddition(https://github.com/Crystal0404/Cr */ diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 096aee98257f24ce187682c256d80b0b13611339..fc357006dcfd94656badf4f78cafb93b0b925324 100644 +index 05770bb17a37733c83464e1c90ce549d5e7771c5..ca017f5e483a4ff5bc497ad453f4cf63a0bb97f5 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -185,7 +185,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaves-server/minecraft-patches/features/0139-Configurable-collision-behavior.patch b/leaves-server/minecraft-patches/features/0138-Configurable-collision-behavior.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0139-Configurable-collision-behavior.patch rename to leaves-server/minecraft-patches/features/0138-Configurable-collision-behavior.patch diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java index fb96577a..b43607b1 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java @@ -330,9 +330,6 @@ public final class LeavesConfig { @GlobalConfig("old-hopper-suck-in-behavior") public boolean oldHopperSuckInBehavior = false; - @GlobalConfig("old-nether-portal-collision") // Should remove in 1.21.6 - public boolean oldNetherPortalCollision = false; - @GlobalConfig("old-zombie-piglin-drop") public boolean oldZombiePiglinDrop = false; @@ -691,6 +688,7 @@ public final class LeavesConfig { @RemovedConfig(name = "ignore-lc", category = "modify") @RemovedConfig(name = "fix-fortress-mob-spawn", category = {"modify", "minecraft-old"}) @RemovedConfig(name = "fast-resume", category = "modify") + @RemovedConfig(name = "old-nether-portal-collision", category = {"modify", "minecraft-old"}) private final boolean removed = false; }