diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-12-06 00:19:33 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-12-06 00:19:33 +0100 |
| commit | 93c4710c3838c3cebc164bcbb1715bfd46844ab8 (patch) | |
| tree | 8db369d6c0f184b79bcb2a2a4a9e9c77f6d78868 /src | |
| parent | c488fb219ab080031488593a0b86ac785a7d2cae (diff) | |
Added missing null checks to c488fb219ab080031488593a0b86ac785a7d2cae
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 5448dd99aae..1bd2ae29105 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -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*/) |