diff options
| author | jackpoz <giacomopoz@gmail.com> | 2020-07-09 22:12:18 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2020-07-09 22:12:18 +0200 |
| commit | b4adaa838c2e44f4008152cc955410d25ff4d8b0 (patch) | |
| tree | 2b0f3178100173f7a0f9a95c1e03c1bbf5675be1 | |
| parent | 293fd67faceffdd7b86dc6843cda5a899af6cac2 (diff) | |
Core/Creature: Add null check for charmed creatures
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 8228ef5a3ba..766cabefe1e 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2834,7 +2834,7 @@ std::string const & Creature::GetNameForLocaleIdx(LocaleConstant loc_idx) const uint32 Creature::GetPetAutoSpellOnPos(uint8 pos) const { - if (pos >= MAX_SPELL_CHARM || m_charmInfo->GetCharmSpell(pos)->GetType() != ACT_ENABLED) + if (pos >= MAX_SPELL_CHARM || !m_charmInfo || m_charmInfo->GetCharmSpell(pos)->GetType() != ACT_ENABLED) return 0; else return m_charmInfo->GetCharmSpell(pos)->GetAction(); |