From e1332a1bb35badbbc76d76109fff3d6703a84934 Mon Sep 17 00:00:00 2001
From: Pixl8 <68357832+pixl8dev@users.noreply.github.com>
Date: Mon, 25 Aug 2025 08:47:26 -0400
Subject: [PATCH 1/2] No collision for spawner-spawned mobs

---
 ...o-collision-for-spawner-spawned-mobs.patch | 34 +++++++++++++++++++
 .../modules/gameplay/NoSpawnerCollision.java  | 21 ++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 leaf-server/minecraft-patches/features/0302-No-collision-for-spawner-spawned-mobs.patch
 create mode 100644 leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/NoSpawnerCollision.java

diff --git a/leaf-server/minecraft-patches/features/0302-No-collision-for-spawner-spawned-mobs.patch b/leaf-server/minecraft-patches/features/0302-No-collision-for-spawner-spawned-mobs.patch
new file mode 100644
index 0000000000..0514e62209
--- /dev/null
+++ b/leaf-server/minecraft-patches/features/0302-No-collision-for-spawner-spawned-mobs.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Pixl8 <68357832+pixl8dev@users.noreply.github.com>
+Date: Wed, 20 Aug 2025 15:58:16 -0400
+Subject: [PATCH] No collision for spawner-spawned mobs
+
+
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index dc66b2c59984ce62b1d3c4a97c769771229fb4f8..8979cac35f6e4f074f89836dd76d127827766af2 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -2986,6 +2986,11 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+ 
+     @Override
+     public void push(Entity entity) {
++        // Leaf start - No collision for spawner-spawned mobs
++        if (org.dreeam.leaf.config.modules.gameplay.NoSpawnerCollision.enabled && this.spawnedViaMobSpawner) {
++            return;
++        }
++        // Leaf end - No collision for spawner-spawned mobs
+         if (!this.isSleeping()) {
+             super.push(entity);
+         }
+@@ -4070,6 +4075,11 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+ 
+     @Override
+     public boolean isCollidable(boolean ignoreClimbing) {
++        // Leaf start - No collision for spawner-spawned mobs
++        if (org.dreeam.leaf.config.modules.gameplay.NoSpawnerCollision.enabled && this.spawnedViaMobSpawner) {
++            return false;
++        }
++        // Leaf end - No collision for spawner-spawned mobs
+         return this.isAlive() && !this.isSpectator() && (ignoreClimbing || !this.onClimbable()) && this.collides; // CraftBukkit
+         // Paper end - Climbing should not bypass cramming gamerule
+     }
diff --git a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/NoSpawnerCollision.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/NoSpawnerCollision.java
new file mode 100644
index 0000000000..4e3f059657
--- /dev/null
+++ b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/NoSpawnerCollision.java
@@ -0,0 +1,21 @@
+package org.dreeam.leaf.config.modules.gameplay;
+
+import org.dreeam.leaf.config.ConfigModules;
+import org.dreeam.leaf.config.EnumConfigCategory;
+
+public class NoSpawnerCollision extends ConfigModules {
+
+    public String getBasePath() {
+        return EnumConfigCategory.GAMEPLAY.getBaseKeyName() + ".no-spawner-collision";
+    }
+
+    public static boolean enabled = false;
+
+    @Override
+    public void onLoaded() {
+        enabled = config.getBoolean(getBasePath(), enabled, config.pickStringRegionBased(
+            "Enable to disable collision for mobs spawned from spawners",
+            "是否禁用从刷怪笼生成的生物与其他实体的碰撞"
+        ));
+    }
+}

From 02bcc81fbe5d5f508f856031531b58338af98d7f Mon Sep 17 00:00:00 2001
From: Pixl8 <68357832+pixl8dev@users.noreply.github.com>
Date: Tue, 9 Sep 2025 09:31:00 -0400
Subject: [PATCH 2/2] change key name

---
 .../dreeam/leaf/config/modules/gameplay/NoSpawnerCollision.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/NoSpawnerCollision.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/NoSpawnerCollision.java
index 4e3f059657..a8919e5898 100644
--- a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/NoSpawnerCollision.java
+++ b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/gameplay/NoSpawnerCollision.java
@@ -6,7 +6,7 @@
 public class NoSpawnerCollision extends ConfigModules {
 
     public String getBasePath() {
-        return EnumConfigCategory.GAMEPLAY.getBaseKeyName() + ".no-spawner-collision";
+        return EnumConfigCategory.GAMEPLAY.getBaseKeyName() + ".disable-mob-collision-from-spawner";
     }
 
     public static boolean enabled = false;