From 3b45e90e417253f045ea66a88b8836fd768a165f Mon Sep 17 00:00:00 2001 From: Walter Pagani Date: Sat, 31 Aug 2024 17:34:56 -0300 Subject: [PATCH] fix(Scripts/ICC): NPC Muradin Dialogues (#18931) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Meji Co-authored-by: 天鹿 <18535853+PkllonG@users.noreply.github.com> --- src/server/game/Entities/Creature/Creature.cpp | 5 ++++- .../Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index cae76f330f75d..29086a8dcb72a 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -3029,8 +3029,11 @@ std::string Creature::GetScriptName() const uint32 Creature::GetScriptId() const { if (CreatureData const* creatureData = GetCreatureData()) - if (uint32 scriptId = creatureData->ScriptId) + { + uint32 scriptId = creatureData->ScriptId; + if (scriptId && GetEntry() == creatureData->id1) return scriptId; + } return sObjectMgr->GetCreatureTemplate(GetEntry())->ScriptID; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 43df1ceaa05c9..4398b49a23ece 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -401,7 +401,7 @@ class instance_icecrown_citadel : public InstanceMapScript case NPC_SE_HIGH_OVERLORD_SAURFANG: if (TeamIdInInstance == TEAM_ALLIANCE) { - creature->UpdateEntry(NPC_SE_MURADIN_BRONZEBEARD, creature->GetCreatureData()); + creature->UpdateEntry(NPC_SE_MURADIN_BRONZEBEARD, true); creature->LoadEquipment(); } DeathbringerSaurfangEventGUID = creature->GetGUID();