From 0d6c4b11cebe074c8000b7feebb6938297515607 Mon Sep 17 00:00:00 2001 From: Gutin <57606752+Gutin1@users.noreply.github.com> Date: Sat, 25 Jan 2025 12:30:45 -0600 Subject: [PATCH] only cancel if would be successful spawn --- .../features/world/environment/mobs/CustomMobSpawner.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/kotlin/net/horizonsend/ion/server/features/world/environment/mobs/CustomMobSpawner.kt b/server/src/main/kotlin/net/horizonsend/ion/server/features/world/environment/mobs/CustomMobSpawner.kt index b9915df00d..57e406d9b8 100644 --- a/server/src/main/kotlin/net/horizonsend/ion/server/features/world/environment/mobs/CustomMobSpawner.kt +++ b/server/src/main/kotlin/net/horizonsend/ion/server/features/world/environment/mobs/CustomMobSpawner.kt @@ -21,14 +21,14 @@ class CustomMobSpawner(val world: IonWorld, mobs: List if (event.entity !is Monster) return if (event.entity.persistentDataContainer.get(CUSTOM_ENTITY, BOOLEAN) == true) return - event.isCancelled = true - val location = event.location val mob = mobs.weightedRandomOrNull { it.spawningWeight } ?: return if (!mob.function.get()) return + event.isCancelled = true + val name = mob.namePool.entries.weightedRandomOrNull { it.value } world.world.spawnEntity(location, mob.getEntityType(), CreatureSpawnEvent.SpawnReason.NATURAL) { entity ->