Merge pull request #1365 from madsboddum/1361

Fixed respawning too many NPCs
ProjectSWGCore · Sep 23, 2023 · 290a030 · 290a030
2 parents adbc82c + 663d481
commit 290a030
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/com/projectswg/holocore/resources/support/npc/spawn/NPCCreator.java b/src/main/java/com/projectswg/holocore/resources/support/npc/spawn/NPCCreator.java
@@ -61,19 +61,19 @@
 
 public class NPCCreator {
 
-	public static Collection<AIObject> createNPCs(Spawner spawner) {
+	public static Collection<AIObject> createAllNPCs(Spawner spawner) {
 		Arguments.validate(spawner.getMinLevel() <= spawner.getMaxLevel(), "min level must be less than max level");
 		int amount = spawner.getAmount();
 		Collection<AIObject> npcs = new ArrayList<>();
 
 		for (int i = 0; i < amount; i++) {
-			npcs.add(createNPC(spawner));
+			npcs.add(createSingleNpc(spawner));
 		}
 
 		return npcs;
 	}
 
-	private static AIObject createNPC(Spawner spawner) {
+	public static AIObject createSingleNpc(Spawner spawner) {
 		int combatLevel = ThreadLocalRandom.current().nextInt(spawner.getMinLevel(), spawner.getMaxLevel()+1);
 		AIObject object = ObjectCreator.createObjectFromTemplate(spawner.getRandomIffTemplate(), AIObject.class);
 

diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/missions/DestroyMissionTerminal.kt b/src/main/java/com/projectswg/holocore/services/gameplay/missions/DestroyMissionTerminal.kt
@@ -120,7 +120,7 @@ class DestroyMissionTerminal(private val missionsToGenerate: Int, private val de
 			.withBehavior(AIBehavior.LOITER)
 			.build()
 
-		NPCCreator.createNPCs(Spawner(spawnInfo, egg))
+		NPCCreator.createAllNPCs(Spawner(spawnInfo, egg))
 	}
 
 	private fun createLair(missionObject: MissionObject): TangibleObject {

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
@@ -154,7 +154,7 @@ class SpawnerService : Service() {
 
 			if (respawnDelay > 0) {
 				executor.execute((respawnDelay * 1000).toLong()) {
-					NPCCreator.createNPCs(spawner)
+					NPCCreator.createSingleNpc(spawner)
 				}
 			} else {
 				DestroyObjectIntent.broadcast(spawner.egg)
@@ -202,7 +202,7 @@ class SpawnerService : Service() {
 		val spawner = Spawner(spawn, egg)
 		egg.setServerAttribute(ServerAttribute.EGG_SPAWNER, spawner)
 
-		NPCCreator.createNPCs(spawner)
+		NPCCreator.createAllNPCs(spawner)
 
 		val patrolRoute = spawner.patrolRoute
 		if (patrolRoute != null) {

diff --git a/src/test/java/com/projectswg/holocore/services/gameplay/combat/NpcDefaultAttackTest.kt b/src/test/java/com/projectswg/holocore/services/gameplay/combat/NpcDefaultAttackTest.kt
@@ -80,7 +80,7 @@ class NpcDefaultAttackTest : TestRunnerSynchronousIntents() {
 				.withLocation(inFrontOfMosEisleyStarport)
 				.build()
 
-		return NPCCreator.createNPCs(Spawner(spawnInfo, egg)).first()
+		return NPCCreator.createAllNPCs(Spawner(spawnInfo, egg)).first()
 	}
 
 }