--- a/net/minecraft/server/EntityChicken.java
+++ b/net/minecraft/server/EntityChicken.java
@@ -44,6 +44,11 @@
     }
 
     public void n() {
+        // CraftBukkit start
+        if (this.isChickenJockey()) {
+            this.persistent = !this.isTypeNotPersistent();
+        }
+        // CraftBukkit end
         super.n();
         this.bB = this.bx;
         this.bz = this.by;
@@ -61,7 +66,9 @@
         this.bx += this.bC * 2.0F;
         if (!this.world.isClientSide && !this.isBaby() && !this.isChickenJockey() && --this.bD <= 0) {
             this.a(SoundEffects.aa, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F);
+            this.forceDrops = true; // CraftBukkit
             this.a(Items.EGG, 1);
+            this.forceDrops = false; // CraftBukkit
             this.bD = this.random.nextInt(6000) + 6000;
         }