From 0b9926961ea6a0742357ee6ce8ff824761f6933c Mon Sep 17 00:00:00 2001
From: ModoX <moardox@gmail.com>
Date: Tue, 9 Jan 2024 23:24:04 +0100
Subject: Core/Conversations: Use WorldObject actors if CreatureId is not
 provided in conversation_actors

---
 src/server/game/Globals/ConversationDataStore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Globals/ConversationDataStore.cpp b/src/server/game/Globals/ConversationDataStore.cpp
index 4a96244cf39..68a3b74cf65 100644
--- a/src/server/game/Globals/ConversationDataStore.cpp
+++ b/src/server/game/Globals/ConversationDataStore.cpp
@@ -178,7 +178,7 @@ void ConversationDataStore::LoadConversationTemplates()
                 actor.Data.emplace<ConversationActorActivePlayerTemplate>();
             else if (noActorObject)
                 actor.Data.emplace<ConversationActorNoObjectTemplate>();
-            else if (data.SpawnId)
+            else if (data.SpawnId || !data.CreatureId) // @TODO: remove CreatureId check when actor flags are implemented
                 actor.Data.emplace<ConversationActorWorldObjectTemplate>();
             else
                 actor.Data.emplace<ConversationActorTalkingHeadTemplate>();
-- 
cgit v1.2.3