From b0127bc4e2f435cefe0b5a093be9ffa0f73f1197 Mon Sep 17 00:00:00 2001 From: Ziggy Date: Mon, 11 Dec 2023 00:25:02 +0100 Subject: [PATCH] NPCs that initially spawn together now also respawn together --- .../holocore/services/support/npc/spawn/SpawnerService.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/services/support/npc/spawn/SpawnerService.kt b/src/main/java/com/projectswg/holocore/services/support/npc/spawn/SpawnerService.kt index 42dde3be6..d3bc03d4b 100644 --- a/src/main/java/com/projectswg/holocore/services/support/npc/spawn/SpawnerService.kt +++ b/src/main/java/com/projectswg/holocore/services/support/npc/spawn/SpawnerService.kt @@ -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)