Paper/nms-patches/MobSpawnerAbstract.patch

--- ../work/decompile-8eb82bde//net/minecraft/server/MobSpawnerAbstract.java	2015-01-18 01:59:59.240758959 -0600
+++ src/main/java/net/minecraft/server/MobSpawnerAbstract.java	2015-01-18 01:59:59.244758959 -0600
@@ -4,6 +4,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.bukkit.event.entity.CreatureSpawnEvent; // CraftBukkit
+
 public abstract class MobSpawnerAbstract {
 
     public int spawnDelay = 20;
@@ -24,6 +26,11 @@
 
     public String getMobName() {
         if (this.i() == null) {
+            // CraftBukkit start - fix NPE
+            if (this.mobName == null) {
+                this.mobName = "Pig";
+            }
+            // CraftBukkit end
             if (this.mobName.equals("Minecart")) {
                 this.mobName = "MinecartRideable";
             }
@@ -129,7 +136,7 @@
 
             entity.f(nbttagcompound);
             if (entity.world != null && flag) {
-                entity.world.addEntity(entity);
+                entity.world.addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
             }
 
             NBTTagCompound nbttagcompound1;
@@ -154,7 +161,7 @@
                     entity2.f(nbttagcompound2);
                     entity2.setPositionRotation(entity1.locX, entity1.locY, entity1.locZ, entity1.yaw, entity1.pitch);
                     if (entity.world != null && flag) {
-                        entity.world.addEntity(entity2);
+                        entity.world.addEntity(entity2, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
                     }
 
                     entity1.mount(entity2);
@@ -162,9 +169,9 @@
 
                 entity1 = entity2;
             }
-        } else if (entity instanceof EntityLiving && entity.world != null && flag) {
+        } else if (entity instanceof EntityInsentient && entity.world != null && flag) { // CraftBukkit - EntityLiving -> EntityInsentient
             ((EntityInsentient) entity).prepare(entity.world.E(new BlockPosition(entity)), (GroupDataEntity) null);
-            entity.world.addEntity(entity);
+            entity.world.addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
         }
 
         return entity;