--- a/net/minecraft/server/MobSpawnerAbstract.java
+++ b/net/minecraft/server/MobSpawnerAbstract.java
@@ -43,6 +43,7 @@
 
     public void setMobName(EntityTypes<?> entitytypes) {
         this.spawnData.getEntity().setString("id", IRegistry.ENTITY_TYPE.getKey(entitytypes).toString());
+        this.mobs.clear(); // CraftBukkit - SPIGOT-3496, MC-92282
     }
 
     private boolean h() {
@@ -132,7 +133,7 @@
                                 }
                             }
 
-                            if (!worldserver.addAllEntitiesSafely(entity)) {
+                            if (!worldserver.addAllEntitiesSafely(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit
                                 this.i();
                                 return;
                             }