nms-patches/MobSpawnerAbstract.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

--- a/net/minecraft/server/MobSpawnerAbstract.java
+++ b/net/minecraft/server/MobSpawnerAbstract.java
@@ -32,6 +32,7 @@
     public void setMobName(@Nullable MinecraftKey minecraftkey) {
         if (minecraftkey != null) {
             this.spawnData.b().setString("id", minecraftkey.toString());
+            this.mobs.clear(); // CraftBukkit - SPIGOT-3496, MC-92282
         }
 
     }
@@ -102,7 +103,7 @@
                             ((EntityInsentient) entity).prepare(world.D(new BlockPosition(entity)), (GroupDataEntity) null);
                         }
 
-                        ChunkRegionLoader.a(entity, world);
+                        ChunkRegionLoader.a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
                         world.triggerEffect(2004, blockposition, 0);
                         if (entityinsentient != null) {
                             entityinsentient.doSpawnEffect();