NPCs that initially spawn together now also respawn together

This commit is contained in:
Ziggy
2023-12-11 00:25:02 +01:00
parent c98290a9b6
commit b0127bc4e2
@@ -49,7 +49,6 @@ import com.projectswg.holocore.resources.support.objects.permissions.AdminPermis
import com.projectswg.holocore.resources.support.objects.swg.SWGObject
import com.projectswg.holocore.resources.support.objects.swg.ServerAttribute
import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureObject
import com.projectswg.holocore.resources.support.objects.swg.custom.AIBehavior
import com.projectswg.holocore.resources.support.objects.swg.custom.AIObject
import com.projectswg.holocore.services.support.objects.ObjectStorageService.BuildingLookup
import com.projectswg.holocore.services.support.objects.ObjectStorageService.ObjectLookup
@@ -149,12 +148,12 @@ class SpawnerService : Service() {
spawner.removeNPC(destroyedObject)
if (spawner.behavior != AIBehavior.PATROL || spawner.npcs.isEmpty()) {
if (spawner.npcs.isEmpty()) {
val respawnDelay = spawner.respawnDelay
if (respawnDelay > 0) {
executor.execute((respawnDelay * 1000).toLong()) {
NPCCreator.createSingleNpc(spawner)
NPCCreator.createAllNPCs(spawner)
}
} else {
DestroyObjectIntent.broadcast(spawner.egg)