--- a/net/minecraft/world/level/MobSpawnerAbstract.java +++ b/net/minecraft/world/level/MobSpawnerAbstract.java @@ -54,6 +54,7 @@ public void setEntityId(EntityTypes entitytypes, @Nullable World world, RandomSource randomsource, BlockPosition blockposition) { this.getOrCreateNextSpawnData(world, randomsource, blockposition).getEntityToSpawn().putString("id", BuiltInRegistries.ENTITY_TYPE.getKey(entitytypes).toString()); + this.spawnPotentials = SimpleWeightedRandomList.empty(); // CraftBukkit - SPIGOT-3496, MC-92282 } private boolean isNearPlayer(World world, BlockPosition blockposition) { @@ -157,13 +158,18 @@ ((EntityInsentient) entity).finalizeSpawn(worldserver, worldserver.getCurrentDifficultyAt(entity.blockPosition()), EnumMobSpawn.SPAWNER, (GroupDataEntity) null); } - Optional optional1 = mobspawnerdata.getEquipment(); + Optional optional1 = mobspawnerdata.getEquipment(); // CraftBukkit - decompile error Objects.requireNonNull(entityinsentient); optional1.ifPresent(entityinsentient::equip); } - if (!worldserver.tryAddFreshEntityWithPassengers(entity)) { + // CraftBukkit start + if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) { + continue; + } + if (!worldserver.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { + // CraftBukkit end this.delay(worldserver, blockposition); return; }