From 1d031c361198e70d35c05706dbff753dd6eb89f8 Mon Sep 17 00:00:00 2001 From: Ziggy Date: Sun, 10 Jan 2021 03:28:18 +0100 Subject: [PATCH] Fix error in ConversationService when spawning a NPC using /createNPC --- .../holocore/resources/support/npc/spawn/Spawner.kt | 2 +- .../gameplay/conversation/ConversationService.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/projectswg/holocore/resources/support/npc/spawn/Spawner.kt b/src/main/java/com/projectswg/holocore/resources/support/npc/spawn/Spawner.kt index a7c59615b..597e0f331 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/npc/spawn/Spawner.kt +++ b/src/main/java/com/projectswg/holocore/resources/support/npc/spawn/Spawner.kt @@ -127,7 +127,7 @@ class Spawner(spawn: SpawnInfo, egg: SWGObject) { val maxLevel: Int get() = spawn.maxLevel - val conversationId: String + val conversationId: String? get() = spawn.conversationId val name: String diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/conversation/ConversationService.java b/src/main/java/com/projectswg/holocore/services/gameplay/conversation/ConversationService.java index b4d84bd68..13c794a28 100644 --- a/src/main/java/com/projectswg/holocore/services/gameplay/conversation/ConversationService.java +++ b/src/main/java/com/projectswg/holocore/services/gameplay/conversation/ConversationService.java @@ -140,6 +140,10 @@ public class ConversationService extends Service { Spawner spawner = npc.getSpawner(); String conversationId = spawner.getConversationId(); + if (conversationId == null) { + return; + } + List conversations = conversationLoader.getInitialConversations(conversationId); Conversation conversation = reduce(conversations, starter.getOwner()); @@ -196,6 +200,10 @@ public class ConversationService extends Service { Spawner spawner = npc.getSpawner(); String conversationId = spawner.getConversationId(); + if (conversationId == null) { + return false; + } + Collection spawnConversationIds = conversationLoader.getConversationIds(conversationId); return !spawnConversationIds.isEmpty();