mirror of
https://github.com/liyunfan1223/mod-playerbots.git
synced 2026-02-20 18:10:02 +01:00
Merge pull request #77 from qudzy/bug/creaturedata-nullptr
Prevent crash by guarding creatureData against nullptr
This commit is contained in:
commit
93c7a665b4
@ -53,8 +53,13 @@ CDPairCalculatedValue::CDPairCalculatedValue(PlayerbotAI* botAI, std::string con
|
|||||||
std::string const CDPairCalculatedValue::Format()
|
std::string const CDPairCalculatedValue::Format()
|
||||||
{
|
{
|
||||||
CreatureData const* creatureData = Calculate();
|
CreatureData const* creatureData = Calculate();
|
||||||
CreatureTemplate const* bmTemplate = sObjectMgr->GetCreatureTemplate(creatureData->id1);
|
if (creatureData)
|
||||||
return bmTemplate ? bmTemplate->Name : "<none>";
|
{
|
||||||
|
CreatureTemplate const* bmTemplate = sObjectMgr->GetCreatureTemplate(creatureData->id1);
|
||||||
|
return bmTemplate ? bmTemplate->Name : "<none>";
|
||||||
|
}
|
||||||
|
|
||||||
|
return "<none>";
|
||||||
}
|
}
|
||||||
|
|
||||||
CDPairListCalculatedValue::CDPairListCalculatedValue(PlayerbotAI* botAI, std::string const name, int32 checkInterval) :
|
CDPairListCalculatedValue::CDPairListCalculatedValue(PlayerbotAI* botAI, std::string const name, int32 checkInterval) :
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user