nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-24 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
郑佩茹
2022-03-22 10:53:26 -06:00
parent db71f4739c 77f13636b7
commit d4062269c8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -2838,7 +2838,8 @@ std::string Creature::GetScriptName() const
uint32 Creature::GetScriptId() const
{
if (CreatureData const* creatureData = GetCreatureData())
return creatureData->ScriptId;
if (uint32 scriptId = creatureData->ScriptId)
return scriptId;
return sObjectMgr->GetCreatureTemplate(GetEntry())->ScriptID;
}

3
src/server/game/Entities/GameObject/GameObject.cpp
View File

@@ -2142,7 +2142,8 @@ void GameObject::EventInform(uint32 eventId)
uint32 GameObject::GetScriptId() const
{
if (GameObjectData const* gameObjectData = GetGOData())
return gameObjectData->ScriptId;
if (uint32 scriptId = gameObjectData->ScriptId)
return scriptId;
return GetGOInfo()->ScriptId;
}