From f02c93f509de9f63a0aa1bf3ff4beca2538f5096 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 15 Mar 2021 14:43:15 -0400
Subject: [PATCH] Core/Conversations: Fill more updatefields with correct data

Port From (https://github.com/TrinityCore/TrinityCore/commit/39652f944555e437a7b08eddd59c874ce6b0612b)
---
 Source/Game/Entities/Conversation.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/Source/Game/Entities/Conversation.cs b/Source/Game/Entities/Conversation.cs
index ea25e5b92..a68378240 100644
--- a/Source/Game/Entities/Conversation.cs
+++ b/Source/Game/Entities/Conversation.cs
@@ -70,9 +70,20 @@ namespace Game.Entities
         public override void Update(uint diff)
         {
             if (GetDuration() > diff)
+            {
                 _duration -= diff;
+                DoWithSuppressingObjectUpdates(() =>
+                {
+                    // Only sent in CreateObject
+                    ApplyModUpdateFieldValue(m_values.ModifyValue(m_conversationData).ModifyValue(m_conversationData.Progress), diff, true);
+                    m_conversationData.ClearChanged(m_conversationData.Progress);
+                });
+            }
             else
+            {
                 Remove(); // expired
+                return;
+            }
 
             base.Update(diff);
         }
@@ -110,6 +121,7 @@ namespace Game.Entities
 
             SetMap(map);
             Relocate(pos);
+            RelocateStationaryPosition(pos);
 
             _Create(ObjectGuid.Create(HighGuid.Conversation, GetMapId(), conversationEntry, lowGuid));
             PhasingHandler.InheritPhaseShift(this, creator);
@@ -123,14 +135,14 @@ namespace Game.Entities
 
             if (conversationTemplate.Actors != null)
             {
-                for (ushort actorIndex = 0; actorIndex < conversationTemplate.Actors.Count; ++actorIndex)
+                foreach (var actor in conversationTemplate.Actors)
                 {
-                    ConversationActorTemplate actor = conversationTemplate.Actors[actorIndex];
                     if (actor != null)
                     {
                         ConversationActor actorField = new ConversationActor();
                         actorField.CreatureID = actor.CreatureId;
                         actorField.CreatureDisplayInfoID = actor.CreatureModelId;
+                        actorField.Id = (int)actor.Id;
                         actorField.Type = ConversationActorType.CreatureActor;
 
                         AddDynamicUpdateFieldValue(m_values.ModifyValue(m_conversationData).ModifyValue(m_conversationData.Actors), actorField);