From 28bc86b2d13fb829ba5a72624dc5609069e582d6 Mon Sep 17 00:00:00 2001 From: MC_XiaoHei Date: Fri, 4 Jul 2025 21:06:37 +0800 Subject: [PATCH] remove useless patch --- ...0108-Configurable-collision-behavior.patch | 54 ------------------- ...tch => 0108-Disable-vault-blacklist.patch} | 0 ...109-Fix-EntityPortalExitEvent-logic.patch} | 2 +- ... => 0110-Fix-CraftPortalEvent-logic.patch} | 0 ...ol.patch => 0111-Xaero-Map-Protocol.patch} | 2 +- ...ible-planar-movement-multiplication.patch} | 2 +- ...=> 0113-Skippable-raid-height-check.patch} | 0 ....patch => 0114-Support-REI-protocol.patch} | 0 ...=> 0115-Vanilla-player-display-name.patch} | 0 ... => 0116-Fix-SculkCatalyst-exp-skip.patch} | 0 ...17-Vanilla-creative-pickup-behavior.patch} | 0 ...patch => 0118-Vanilla-portal-handle.patch} | 2 +- ...h => 0119-Fix-chunk-reload-detector.patch} | 0 ...not-reset-placed-block-on-exception.patch} | 0 ...ock-entity-and-entity-crash-at-Leve.patch} | 0 ... => 0122-Tripwire-behavior-modifier.patch} | 0 ...=> 0123-Old-nether-portal-collision.patch} | 0 ...tch => 0124-Spawn-invulnerable-time.patch} | 0 ...ch => 0125-Old-zombie-reinforcement.patch} | 0 ...ch => 0126-Sound-update-suppression.patch} | 0 ...127-Old-zombie-piglin-drop-behavior.patch} | 0 ...b.patch => 0128-Fast-exp-orb-absorb.patch} | 0 ...patch => 0129-Vanilla-Fluid-Pushing.patch} | 2 +- ...0130-Configurable-item-damage-check.patch} | 0 ...Old-Throwable-Projectile-tick-order.patch} | 0 ...ld-leash-behavior-when-use-firework.patch} | 0 ...> 0133-Old-wet-tnt-explode-behavior.patch} | 0 ...4-Old-projectile-explosion-behavior.patch} | 0 ...tem-drops-due-to-update-suppression.patch} | 0 .../org/leavesmc/leaves/LeavesConfig.java | 10 +--- 30 files changed, 7 insertions(+), 67 deletions(-) delete mode 100644 leaves-server/minecraft-patches/features/0108-Configurable-collision-behavior.patch rename leaves-server/minecraft-patches/features/{0109-Disable-vault-blacklist.patch => 0108-Disable-vault-blacklist.patch} (100%) rename leaves-server/minecraft-patches/features/{0110-Fix-EntityPortalExitEvent-logic.patch => 0109-Fix-EntityPortalExitEvent-logic.patch} (96%) rename leaves-server/minecraft-patches/features/{0111-Fix-CraftPortalEvent-logic.patch => 0110-Fix-CraftPortalEvent-logic.patch} (100%) rename leaves-server/minecraft-patches/features/{0112-Xaero-Map-Protocol.patch => 0111-Xaero-Map-Protocol.patch} (92%) rename leaves-server/minecraft-patches/features/{0113-Skip-negligible-planar-movement-multiplication.patch => 0112-Skip-negligible-planar-movement-multiplication.patch} (94%) rename leaves-server/minecraft-patches/features/{0114-Skippable-raid-height-check.patch => 0113-Skippable-raid-height-check.patch} (100%) rename leaves-server/minecraft-patches/features/{0115-Support-REI-protocol.patch => 0114-Support-REI-protocol.patch} (100%) rename leaves-server/minecraft-patches/features/{0116-Vanilla-player-display-name.patch => 0115-Vanilla-player-display-name.patch} (100%) rename leaves-server/minecraft-patches/features/{0117-Fix-SculkCatalyst-exp-skip.patch => 0116-Fix-SculkCatalyst-exp-skip.patch} (100%) rename leaves-server/minecraft-patches/features/{0118-Vanilla-creative-pickup-behavior.patch => 0117-Vanilla-creative-pickup-behavior.patch} (100%) rename leaves-server/minecraft-patches/features/{0119-Vanilla-portal-handle.patch => 0118-Vanilla-portal-handle.patch} (96%) rename leaves-server/minecraft-patches/features/{0120-Fix-chunk-reload-detector.patch => 0119-Fix-chunk-reload-detector.patch} (100%) rename leaves-server/minecraft-patches/features/{0121-Do-not-reset-placed-block-on-exception.patch => 0120-Do-not-reset-placed-block-on-exception.patch} (100%) rename leaves-server/minecraft-patches/features/{0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch => 0121-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch} (100%) rename leaves-server/minecraft-patches/features/{0123-Tripwire-behavior-modifier.patch => 0122-Tripwire-behavior-modifier.patch} (100%) rename leaves-server/minecraft-patches/features/{0124-Old-nether-portal-collision.patch => 0123-Old-nether-portal-collision.patch} (100%) rename leaves-server/minecraft-patches/features/{0125-Spawn-invulnerable-time.patch => 0124-Spawn-invulnerable-time.patch} (100%) rename leaves-server/minecraft-patches/features/{0126-Old-zombie-reinforcement.patch => 0125-Old-zombie-reinforcement.patch} (100%) rename leaves-server/minecraft-patches/features/{0127-Sound-update-suppression.patch => 0126-Sound-update-suppression.patch} (100%) rename leaves-server/minecraft-patches/features/{0128-Old-zombie-piglin-drop-behavior.patch => 0127-Old-zombie-piglin-drop-behavior.patch} (100%) rename leaves-server/minecraft-patches/features/{0129-Fast-exp-orb-absorb.patch => 0128-Fast-exp-orb-absorb.patch} (100%) rename leaves-server/minecraft-patches/features/{0130-Vanilla-Fluid-Pushing.patch => 0129-Vanilla-Fluid-Pushing.patch} (92%) rename leaves-server/minecraft-patches/features/{0131-Configurable-item-damage-check.patch => 0130-Configurable-item-damage-check.patch} (100%) rename leaves-server/minecraft-patches/features/{0132-Old-Throwable-Projectile-tick-order.patch => 0131-Old-Throwable-Projectile-tick-order.patch} (100%) rename leaves-server/minecraft-patches/features/{0133-Old-leash-behavior-when-use-firework.patch => 0132-Old-leash-behavior-when-use-firework.patch} (100%) rename leaves-server/minecraft-patches/features/{0134-Old-wet-tnt-explode-behavior.patch => 0133-Old-wet-tnt-explode-behavior.patch} (100%) rename leaves-server/minecraft-patches/features/{0135-Old-projectile-explosion-behavior.patch => 0134-Old-projectile-explosion-behavior.patch} (100%) rename leaves-server/minecraft-patches/features/{0136-Prevent-loss-of-item-drops-due-to-update-suppression.patch => 0135-Prevent-loss-of-item-drops-due-to-update-suppression.patch} (100%) diff --git a/leaves-server/minecraft-patches/features/0108-Configurable-collision-behavior.patch b/leaves-server/minecraft-patches/features/0108-Configurable-collision-behavior.patch deleted file mode 100644 index 4b4ed57b..00000000 --- a/leaves-server/minecraft-patches/features/0108-Configurable-collision-behavior.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Fortern -Date: Thu, 24 Oct 2024 23:10:34 +0800 -Subject: [PATCH] Configurable collision behavior - - -diff --git a/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java b/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java -index 01cd38bba2deb6cf65c82b4e4ec352a2998fd339..8eb8e1447043498c6a0db1b56e877a91cd5fc438 100644 ---- a/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java -+++ b/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java -@@ -101,6 +101,14 @@ public final class CollisionUtil { - (box1.minZ - box2.maxZ) < -COLLISION_EPSILON && (box1.maxZ - box2.minZ) > COLLISION_EPSILON; - } - -+ // Leaves start - Configurable collision behavior -+ public static boolean voxelShapeIntersectVanilla(final AABB box1, final AABB box2) { -+ return box1.minX < box2.maxX && box1.maxX > box2.minX && -+ box1.minY < box2.maxY && box1.maxY > box2.minY && -+ box1.minZ < box2.maxZ && box1.maxZ > box2.minZ; -+ } -+ // Leaves end - Configurable collision behavior -+ - // assume !isEmpty(target) && abs(source_move) >= COLLISION_EPSILON - public static double collideX(final AABB target, final AABB source, final double source_move) { - if ((source.minY - target.maxY) < -COLLISION_EPSILON && (source.maxY - target.minY) > COLLISION_EPSILON && -@@ -2014,7 +2022,9 @@ public final class CollisionUtil { - AABB singleAABB = ((CollisionVoxelShape)blockCollision).moonrise$getSingleAABBRepresentation(); - if (singleAABB != null) { - singleAABB = singleAABB.move((double)blockX, (double)blockY, (double)blockZ); -- if (!voxelShapeIntersect(aabb, singleAABB)) { -+ // Leaves start - Configurable collision behavior -+ if (shouldSkip(aabb, blockCollision, singleAABB)) { -+ // Leaves end - Configurable collision behavior - continue; - } - -@@ -2067,6 +2077,17 @@ public final class CollisionUtil { - return ret; - } - -+ // Leaves start - Configurable collision behavior -+ private static boolean shouldSkip(net.minecraft.world.phys.AABB aabb, net.minecraft.world.phys.shapes.VoxelShape blockCollision, net.minecraft.world.phys.AABB singleAABB) { -+ boolean isBlockShape = blockCollision == net.minecraft.world.phys.shapes.Shapes.block(); -+ return switch (org.leavesmc.leaves.LeavesConfig.fix.collisionBehavior) { -+ case PAPER -> !voxelShapeIntersect(aabb, singleAABB); -+ case VANILLA -> !voxelShapeIntersectVanilla(aabb, singleAABB); -+ case BLOCK_SHAPE_VANILLA -> isBlockShape && !voxelShapeIntersectVanilla(aabb, singleAABB) || !isBlockShape && !voxelShapeIntersect(aabb, singleAABB); -+ }; -+ } -+ // Leaves end - Configurable collision behavior -+ - public static boolean getEntityHardCollisions(final Level world, final Entity entity, AABB aabb, - final List into, final int collisionFlags, final Predicate predicate) { - final boolean checkOnly = (collisionFlags & COLLISION_FLAG_CHECK_ONLY) != 0; diff --git a/leaves-server/minecraft-patches/features/0109-Disable-vault-blacklist.patch b/leaves-server/minecraft-patches/features/0108-Disable-vault-blacklist.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0109-Disable-vault-blacklist.patch rename to leaves-server/minecraft-patches/features/0108-Disable-vault-blacklist.patch diff --git a/leaves-server/minecraft-patches/features/0110-Fix-EntityPortalExitEvent-logic.patch b/leaves-server/minecraft-patches/features/0109-Fix-EntityPortalExitEvent-logic.patch similarity index 96% rename from leaves-server/minecraft-patches/features/0110-Fix-EntityPortalExitEvent-logic.patch rename to leaves-server/minecraft-patches/features/0109-Fix-EntityPortalExitEvent-logic.patch index 66d34562..211950db 100644 --- a/leaves-server/minecraft-patches/features/0110-Fix-EntityPortalExitEvent-logic.patch +++ b/leaves-server/minecraft-patches/features/0109-Fix-EntityPortalExitEvent-logic.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix EntityPortalExitEvent logic diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 4547d836f4536ef4e003b772f5c526a691392934..1ae96278974a767482f520e2ace69e91a2de2e4c 100644 +index 0df6539fb2f1cecd537d16e7f78d0bba5a6d3db7..d158471bd95f3e4f810ba41ea07ee6b4d341d42f 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -3985,19 +3985,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaves-server/minecraft-patches/features/0111-Fix-CraftPortalEvent-logic.patch b/leaves-server/minecraft-patches/features/0110-Fix-CraftPortalEvent-logic.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0111-Fix-CraftPortalEvent-logic.patch rename to leaves-server/minecraft-patches/features/0110-Fix-CraftPortalEvent-logic.patch diff --git a/leaves-server/minecraft-patches/features/0112-Xaero-Map-Protocol.patch b/leaves-server/minecraft-patches/features/0111-Xaero-Map-Protocol.patch similarity index 92% rename from leaves-server/minecraft-patches/features/0112-Xaero-Map-Protocol.patch rename to leaves-server/minecraft-patches/features/0111-Xaero-Map-Protocol.patch index 002ade30..d002e9af 100644 --- a/leaves-server/minecraft-patches/features/0112-Xaero-Map-Protocol.patch +++ b/leaves-server/minecraft-patches/features/0111-Xaero-Map-Protocol.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Xaero Map Protocol diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 0d511f3dbb6c41c4ca152303123f3bc2dd90cbbc..5a9aa8da0c0e17b4a0d33d2d56e2e6954381dc4e 100644 +index 1d370d5fc9f69bcf2f7087373e9b53fbac792821..37999b937a88c8fd9ca2cba24dc6383e09610eb5 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -1319,6 +1319,7 @@ public abstract class PlayerList { diff --git a/leaves-server/minecraft-patches/features/0113-Skip-negligible-planar-movement-multiplication.patch b/leaves-server/minecraft-patches/features/0112-Skip-negligible-planar-movement-multiplication.patch similarity index 94% rename from leaves-server/minecraft-patches/features/0113-Skip-negligible-planar-movement-multiplication.patch rename to leaves-server/minecraft-patches/features/0112-Skip-negligible-planar-movement-multiplication.patch index 4ae0831d..127a522b 100644 --- a/leaves-server/minecraft-patches/features/0113-Skip-negligible-planar-movement-multiplication.patch +++ b/leaves-server/minecraft-patches/features/0112-Skip-negligible-planar-movement-multiplication.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Skip negligible planar movement multiplication This patch is Powered by Gale(https://github.com/Dreeam-qwq/Gale) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 1ae96278974a767482f520e2ace69e91a2de2e4c..2d1c112b7f762de3b7444b9da25f767aac57404d 100644 +index d158471bd95f3e4f810ba41ea07ee6b4d341d42f..47b9ddcecd0853927a4a41264bda15a935b55671 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1234,8 +1234,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaves-server/minecraft-patches/features/0114-Skippable-raid-height-check.patch b/leaves-server/minecraft-patches/features/0113-Skippable-raid-height-check.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0114-Skippable-raid-height-check.patch rename to leaves-server/minecraft-patches/features/0113-Skippable-raid-height-check.patch diff --git a/leaves-server/minecraft-patches/features/0115-Support-REI-protocol.patch b/leaves-server/minecraft-patches/features/0114-Support-REI-protocol.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0115-Support-REI-protocol.patch rename to leaves-server/minecraft-patches/features/0114-Support-REI-protocol.patch diff --git a/leaves-server/minecraft-patches/features/0116-Vanilla-player-display-name.patch b/leaves-server/minecraft-patches/features/0115-Vanilla-player-display-name.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0116-Vanilla-player-display-name.patch rename to leaves-server/minecraft-patches/features/0115-Vanilla-player-display-name.patch diff --git a/leaves-server/minecraft-patches/features/0117-Fix-SculkCatalyst-exp-skip.patch b/leaves-server/minecraft-patches/features/0116-Fix-SculkCatalyst-exp-skip.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0117-Fix-SculkCatalyst-exp-skip.patch rename to leaves-server/minecraft-patches/features/0116-Fix-SculkCatalyst-exp-skip.patch diff --git a/leaves-server/minecraft-patches/features/0118-Vanilla-creative-pickup-behavior.patch b/leaves-server/minecraft-patches/features/0117-Vanilla-creative-pickup-behavior.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0118-Vanilla-creative-pickup-behavior.patch rename to leaves-server/minecraft-patches/features/0117-Vanilla-creative-pickup-behavior.patch diff --git a/leaves-server/minecraft-patches/features/0119-Vanilla-portal-handle.patch b/leaves-server/minecraft-patches/features/0118-Vanilla-portal-handle.patch similarity index 96% rename from leaves-server/minecraft-patches/features/0119-Vanilla-portal-handle.patch rename to leaves-server/minecraft-patches/features/0118-Vanilla-portal-handle.patch index 5618bea1..206c86c9 100644 --- a/leaves-server/minecraft-patches/features/0119-Vanilla-portal-handle.patch +++ b/leaves-server/minecraft-patches/features/0118-Vanilla-portal-handle.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Vanilla portal handle diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 2d1c112b7f762de3b7444b9da25f767aac57404d..b42b0788b7df9f39429d18ce12b525beb7609bd5 100644 +index 47b9ddcecd0853927a4a41264bda15a935b55671..0dde70f12ede6da06a0b9f0e78272a963a167699 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -836,6 +836,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaves-server/minecraft-patches/features/0120-Fix-chunk-reload-detector.patch b/leaves-server/minecraft-patches/features/0119-Fix-chunk-reload-detector.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0120-Fix-chunk-reload-detector.patch rename to leaves-server/minecraft-patches/features/0119-Fix-chunk-reload-detector.patch diff --git a/leaves-server/minecraft-patches/features/0121-Do-not-reset-placed-block-on-exception.patch b/leaves-server/minecraft-patches/features/0120-Do-not-reset-placed-block-on-exception.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0121-Do-not-reset-placed-block-on-exception.patch rename to leaves-server/minecraft-patches/features/0120-Do-not-reset-placed-block-on-exception.patch diff --git a/leaves-server/minecraft-patches/features/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch b/leaves-server/minecraft-patches/features/0121-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch rename to leaves-server/minecraft-patches/features/0121-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch diff --git a/leaves-server/minecraft-patches/features/0123-Tripwire-behavior-modifier.patch b/leaves-server/minecraft-patches/features/0122-Tripwire-behavior-modifier.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0123-Tripwire-behavior-modifier.patch rename to leaves-server/minecraft-patches/features/0122-Tripwire-behavior-modifier.patch diff --git a/leaves-server/minecraft-patches/features/0124-Old-nether-portal-collision.patch b/leaves-server/minecraft-patches/features/0123-Old-nether-portal-collision.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0124-Old-nether-portal-collision.patch rename to leaves-server/minecraft-patches/features/0123-Old-nether-portal-collision.patch diff --git a/leaves-server/minecraft-patches/features/0125-Spawn-invulnerable-time.patch b/leaves-server/minecraft-patches/features/0124-Spawn-invulnerable-time.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0125-Spawn-invulnerable-time.patch rename to leaves-server/minecraft-patches/features/0124-Spawn-invulnerable-time.patch diff --git a/leaves-server/minecraft-patches/features/0126-Old-zombie-reinforcement.patch b/leaves-server/minecraft-patches/features/0125-Old-zombie-reinforcement.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0126-Old-zombie-reinforcement.patch rename to leaves-server/minecraft-patches/features/0125-Old-zombie-reinforcement.patch diff --git a/leaves-server/minecraft-patches/features/0127-Sound-update-suppression.patch b/leaves-server/minecraft-patches/features/0126-Sound-update-suppression.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0127-Sound-update-suppression.patch rename to leaves-server/minecraft-patches/features/0126-Sound-update-suppression.patch diff --git a/leaves-server/minecraft-patches/features/0128-Old-zombie-piglin-drop-behavior.patch b/leaves-server/minecraft-patches/features/0127-Old-zombie-piglin-drop-behavior.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0128-Old-zombie-piglin-drop-behavior.patch rename to leaves-server/minecraft-patches/features/0127-Old-zombie-piglin-drop-behavior.patch diff --git a/leaves-server/minecraft-patches/features/0129-Fast-exp-orb-absorb.patch b/leaves-server/minecraft-patches/features/0128-Fast-exp-orb-absorb.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0129-Fast-exp-orb-absorb.patch rename to leaves-server/minecraft-patches/features/0128-Fast-exp-orb-absorb.patch diff --git a/leaves-server/minecraft-patches/features/0130-Vanilla-Fluid-Pushing.patch b/leaves-server/minecraft-patches/features/0129-Vanilla-Fluid-Pushing.patch similarity index 92% rename from leaves-server/minecraft-patches/features/0130-Vanilla-Fluid-Pushing.patch rename to leaves-server/minecraft-patches/features/0129-Vanilla-Fluid-Pushing.patch index 03227e5f..49bd3038 100644 --- a/leaves-server/minecraft-patches/features/0130-Vanilla-Fluid-Pushing.patch +++ b/leaves-server/minecraft-patches/features/0129-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 b42b0788b7df9f39429d18ce12b525beb7609bd5..aba79f3848ab826869d4050ce02b3483b91f34e2 100644 +index 0dde70f12ede6da06a0b9f0e78272a963a167699..a0fc0613bbda652d439215d7d6282ac710c1461d 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -4823,8 +4823,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaves-server/minecraft-patches/features/0131-Configurable-item-damage-check.patch b/leaves-server/minecraft-patches/features/0130-Configurable-item-damage-check.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0131-Configurable-item-damage-check.patch rename to leaves-server/minecraft-patches/features/0130-Configurable-item-damage-check.patch diff --git a/leaves-server/minecraft-patches/features/0132-Old-Throwable-Projectile-tick-order.patch b/leaves-server/minecraft-patches/features/0131-Old-Throwable-Projectile-tick-order.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0132-Old-Throwable-Projectile-tick-order.patch rename to leaves-server/minecraft-patches/features/0131-Old-Throwable-Projectile-tick-order.patch diff --git a/leaves-server/minecraft-patches/features/0133-Old-leash-behavior-when-use-firework.patch b/leaves-server/minecraft-patches/features/0132-Old-leash-behavior-when-use-firework.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0133-Old-leash-behavior-when-use-firework.patch rename to leaves-server/minecraft-patches/features/0132-Old-leash-behavior-when-use-firework.patch diff --git a/leaves-server/minecraft-patches/features/0134-Old-wet-tnt-explode-behavior.patch b/leaves-server/minecraft-patches/features/0133-Old-wet-tnt-explode-behavior.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0134-Old-wet-tnt-explode-behavior.patch rename to leaves-server/minecraft-patches/features/0133-Old-wet-tnt-explode-behavior.patch diff --git a/leaves-server/minecraft-patches/features/0135-Old-projectile-explosion-behavior.patch b/leaves-server/minecraft-patches/features/0134-Old-projectile-explosion-behavior.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0135-Old-projectile-explosion-behavior.patch rename to leaves-server/minecraft-patches/features/0134-Old-projectile-explosion-behavior.patch diff --git a/leaves-server/minecraft-patches/features/0136-Prevent-loss-of-item-drops-due-to-update-suppression.patch b/leaves-server/minecraft-patches/features/0135-Prevent-loss-of-item-drops-due-to-update-suppression.patch similarity index 100% rename from leaves-server/minecraft-patches/features/0136-Prevent-loss-of-item-drops-due-to-update-suppression.patch rename to leaves-server/minecraft-patches/features/0135-Prevent-loss-of-item-drops-due-to-update-suppression.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 448f76a7..ffc17589 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java @@ -1121,17 +1121,11 @@ public final class LeavesConfig { @GlobalConfig("vanilla-display-name") public boolean vanillaDisplayName = false; - @GlobalConfig(value = "collision-behavior") - public CollisionBehavior collisionBehavior = CollisionBehavior.BLOCK_SHAPE_VANILLA; - - public enum CollisionBehavior { - VANILLA, BLOCK_SHAPE_VANILLA, PAPER - } - @GlobalConfig("vanilla-portal-handle") public boolean vanillaPortalHandle = false; + @RemovedConfig(name = "collision-behavior", category = "fix") @RemovedConfig(name = "spigot-EndPlatform-destroy", category = "fix") - private final boolean spigotEndPlatformDestroy = false; + private final boolean removed = false; } }