remove useless patch

leaves-server/minecraft-patches/features/0108-Configurable-collision-behavior.patch

@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fortern <blueten.ki@gmail.com>
-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<AABB> into, final int collisionFlags, final Predicate<Entity> predicate) {
-         final boolean checkOnly = (collisionFlags & COLLISION_FLAG_CHECK_ONLY) != 0;

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

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 {

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

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

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

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;
     }
 }