sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/ICC): NPC Muradin Dialogues (#18931)

Browse Source 
Co-authored-by: Meji <alvaro.megias@outlook.com>
Co-authored-by: 天鹿 <18535853+PkllonG@users.noreply.github.com>
This commit is contained in:
Walter Pagani
2024-08-31 17:34:56 -03:00
committed by GitHub
parent 43d60694e4
commit 3b45e90e41
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Creature/Creature.cpp
+4 -1
View File
@@ -3029,8 +3029,11 @@ std::string Creature::GetScriptName() const
uint32 Creature::GetScriptId() const uint32 Creature::GetScriptId() const
{ {
if (CreatureData const* creatureData = GetCreatureData()) if (CreatureData const* creatureData = GetCreatureData())
if (uint32 scriptId = creatureData->ScriptId) {
uint32 scriptId = creatureData->ScriptId;
if (scriptId && GetEntry() == creatureData->id1)
return scriptId; return scriptId;
}
return sObjectMgr->GetCreatureTemplate(GetEntry())->ScriptID; return sObjectMgr->GetCreatureTemplate(GetEntry())->ScriptID;
} }
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+1 -1
View File
@@ -401,7 +401,7 @@ public:
case NPC_SE_HIGH_OVERLORD_SAURFANG: case NPC_SE_HIGH_OVERLORD_SAURFANG:
if (TeamIdInInstance == TEAM_ALLIANCE) if (TeamIdInInstance == TEAM_ALLIANCE)
{ {
creature->UpdateEntry(NPC_SE_MURADIN_BRONZEBEARD, creature->GetCreatureData()); creature->UpdateEntry(NPC_SE_MURADIN_BRONZEBEARD, true);
creature->LoadEquipment(); creature->LoadEquipment();
} }
DeathbringerSaurfangEventGUID = creature->GetGUID(); DeathbringerSaurfangEventGUID = creature->GetGUID();