Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 08:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added missing null checks to c488fb219a

Browse Source
This commit is contained in:
Shauren
2015-12-06 00:19:33 +01:00
parent c488fb219a
commit 93c4710c38
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,43 +108,43 @@ uint32 CreatureTemplate::GetFirstValidModelId() const
uint32 CreatureTemplate::GetFirstInvisibleModel() const
{
CreatureModelInfo const* modelInfo = sObjectMgr->GetCreatureModelInfo(Modelid1);
if (modelInfo->is_trigger)
if (modelInfo && modelInfo->is_trigger)
return Modelid1;
modelInfo = sObjectMgr->GetCreatureModelInfo(Modelid2);
if (modelInfo->is_trigger)
if (modelInfo && modelInfo->is_trigger)
return Modelid2;
modelInfo = sObjectMgr->GetCreatureModelInfo(Modelid3);
if (modelInfo->is_trigger)
if (modelInfo && modelInfo->is_trigger)
return Modelid3;
modelInfo = sObjectMgr->GetCreatureModelInfo(Modelid4);
if (modelInfo->is_trigger)
if (modelInfo && modelInfo->is_trigger)
return Modelid4;
return 0;
return 11686;
}
uint32 CreatureTemplate::GetFirstVisibleModel() const
{
CreatureModelInfo const* modelInfo = sObjectMgr->GetCreatureModelInfo(Modelid1);
if (!modelInfo->is_trigger)
if (modelInfo && !modelInfo->is_trigger)
return Modelid1;
modelInfo = sObjectMgr->GetCreatureModelInfo(Modelid2);
if (!modelInfo->is_trigger)
if (modelInfo && !modelInfo->is_trigger)
return Modelid2;
modelInfo = sObjectMgr->GetCreatureModelInfo(Modelid3);
if (!modelInfo->is_trigger)
if (modelInfo && !modelInfo->is_trigger)
return Modelid3;
modelInfo = sObjectMgr->GetCreatureModelInfo(Modelid4);
if (!modelInfo->is_trigger)
if (modelInfo && !modelInfo->is_trigger)
return Modelid4;
return 0;
return 17519;
}
bool AssistDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)