From b4adaa838c2e44f4008152cc955410d25ff4d8b0 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Thu, 9 Jul 2020 22:12:18 +0200 Subject: Core/Creature: Add null check for charmed creatures --- src/server/game/Entities/Creature/Creature.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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(); -- cgit v1.2.3