From ebcad7dbc5c5b6d75dc7ebea098147c22e1d4899 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 5 Feb 2024 19:32:58 -0500 Subject: [PATCH] Core/Conversations: Use WorldObject actors if CreatureId is not provided in conversation_actors Port From (https://github.com/TrinityCore/TrinityCore/commit/0b9926961ea6a0742357ee6ce8ff824761f6933c) --- Source/Game/DataStorage/ConversationDataStorage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Game/DataStorage/ConversationDataStorage.cs b/Source/Game/DataStorage/ConversationDataStorage.cs index 956cbec74..4f79851cc 100644 --- a/Source/Game/DataStorage/ConversationDataStorage.cs +++ b/Source/Game/DataStorage/ConversationDataStorage.cs @@ -76,7 +76,7 @@ namespace Game.DataStorage actor.ActivePlayerTemplate = new(); else if (noActorObject) actor.NoObjectTemplate = new(); - else if (data.SpawnId != 0) + else if (data.SpawnId != 0 || data.CreatureId == 0) // @TODO: remove CreatureId check when actor flags are implemented actor.WorldObjectTemplate = new(); else actor.TalkingHeadTemplate = new();