--- /home/matt/mc-dev-private//net/minecraft/server/EntityAgeable.java	2015-02-26 22:40:22.467608141 +0000
+++ src/main/java/net/minecraft/server/EntityAgeable.java	2015-02-26 22:40:22.467608141 +0000
@@ -7,6 +7,7 @@
     protected int c;
     private float bm = -1.0F;
     private float bn;
+    public boolean ageLocked = false; // CraftBukkit
 
     public EntityAgeable(World world) {
         super(world);
@@ -27,14 +28,14 @@
                     if (entityageable != null) {
                         entityageable.setAgeRaw(-24000);
                         entityageable.setPositionRotation(this.locX, this.locY, this.locZ, 0.0F, 0.0F);
-                        this.world.addEntity(entityageable);
+                        this.world.addEntity(entityageable, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG); // CraftBukkit
                         if (itemstack.hasName()) {
                             entityageable.setCustomName(itemstack.getName());
                         }
 
                         if (!entityhuman.abilities.canInstantlyBuild) {
                             --itemstack.count;
-                            if (itemstack.count <= 0) {
+                            if (itemstack.count == 0) { // CraftBukkit - allow less than 0 stacks as "infinite"
                                 entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, (ItemStack) null);
                             }
                         }
@@ -99,17 +100,19 @@
         super.b(nbttagcompound);
         nbttagcompound.setInt("Age", this.getAge());
         nbttagcompound.setInt("ForcedAge", this.b);
+        nbttagcompound.setBoolean("AgeLocked", this.ageLocked); // CraftBukkit
     }
 
     public void a(NBTTagCompound nbttagcompound) {
         super.a(nbttagcompound);
         this.setAgeRaw(nbttagcompound.getInt("Age"));
         this.b = nbttagcompound.getInt("ForcedAge");
+        this.ageLocked = nbttagcompound.getBoolean("AgeLocked"); // CraftBukkit
     }
 
     public void m() {
         super.m();
-        if (this.world.isClientSide) {
+        if (this.world.isClientSide || ageLocked) { // CraftBukkit
             if (this.c > 0) {
                 if (this.c % 4 == 0) {
                     this.world.addParticle(EnumParticle.VILLAGER_HAPPY, this.locX + (double) (this.random.nextFloat() * this.width * 2.0F) - (double) this.width, this.locY + 0.5D + (double) (this.random.nextFloat() * this.length), this.locZ + (double) (this.random.nextFloat() * this.width * 2.0F) - (double) this.width, 0.0D, 0.0D, 0.0D, new int[0]);
@@ -146,7 +149,7 @@
         this.a(flag ? 0.5F : 1.0F);
     }
 
-    protected final void setSize(float f, float f1) {
+    public final void setSize(float f, float f1) { // CraftBukkit - protected to public
         boolean flag = this.bm > 0.0F;
 
         this.bm = f;