Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Conversations: Fill more updatefields with correct data

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/39652f944555e437a7b08eddd59c874ce6b0612b)
This commit is contained in:
hondacrx
2021-03-15 14:43:15 -04:00
parent ecad90c7d4
commit f02c93f509
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Conversation.cs
+14 -2
View File
@@ -70,9 +70,20 @@ namespace Game.Entities
public override void Update(uint diff) public override void Update(uint diff)
{ {
if (GetDuration() > diff) if (GetDuration() > diff)
{
_duration -= 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 else
{
Remove(); // expired Remove(); // expired
return;
}
base.Update(diff); base.Update(diff);
} }
@@ -110,6 +121,7 @@ namespace Game.Entities
SetMap(map); SetMap(map);
Relocate(pos); Relocate(pos);
RelocateStationaryPosition(pos);
_Create(ObjectGuid.Create(HighGuid.Conversation, GetMapId(), conversationEntry, lowGuid)); _Create(ObjectGuid.Create(HighGuid.Conversation, GetMapId(), conversationEntry, lowGuid));
PhasingHandler.InheritPhaseShift(this, creator); PhasingHandler.InheritPhaseShift(this, creator);
@@ -123,14 +135,14 @@ namespace Game.Entities
if (conversationTemplate.Actors != null) 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) if (actor != null)
{ {
ConversationActor actorField = new ConversationActor(); ConversationActor actorField = new ConversationActor();
actorField.CreatureID = actor.CreatureId; actorField.CreatureID = actor.CreatureId;
actorField.CreatureDisplayInfoID = actor.CreatureModelId; actorField.CreatureDisplayInfoID = actor.CreatureModelId;
actorField.Id = (int)actor.Id;
actorField.Type = ConversationActorType.CreatureActor; actorField.Type = ConversationActorType.CreatureActor;
AddDynamicUpdateFieldValue(m_values.ModifyValue(m_conversationData).ModifyValue(m_conversationData.Actors), actorField); AddDynamicUpdateFieldValue(m_values.ModifyValue(m_conversationData).ModifyValue(m_conversationData.Actors), actorField);