diff --git a/nms-patches/PathfinderGoalRemoveBlock.patch b/nms-patches/PathfinderGoalRemoveBlock.patch
new file mode 100644
index 0000000000..b97b174277
--- /dev/null
+++ b/nms-patches/PathfinderGoalRemoveBlock.patch
@@ -0,0 +1,28 @@
+--- a/net/minecraft/server/PathfinderGoalRemoveBlock.java
++++ b/net/minecraft/server/PathfinderGoalRemoveBlock.java
+@@ -2,6 +2,10 @@
+ 
+ import java.util.Random;
+ import javax.annotation.Nullable;
++// CraftBukkit start
++import org.bukkit.craftbukkit.block.CraftBlock;
++import org.bukkit.event.entity.EntityInteractEvent;
++// CraftBukkit end
+ 
+ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
+ 
+@@ -66,6 +70,14 @@
+             }
+ 
+             if (this.h > 60) {
++                // CraftBukkit start - Step on eggs
++                EntityInteractEvent event = new EntityInteractEvent(this.g.getBukkitEntity(), CraftBlock.at(world, blockposition1));
++                world.getServer().getPluginManager().callEvent((EntityInteractEvent) event);
++
++                if (event.isCancelled()) {
++                    return;
++                }
++                // CraftBukkit end
+                 world.setAir(blockposition1);
+                 if (!world.isClientSide) {
+                     for (int i = 0; i < 20; ++i) {