From ff778a7581b47458d257e867931de0f3b46589e4 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 (cherry picked from commit b4adaa838c2e44f4008152cc955410d25ff4d8b0) --- 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 bf364fca4c6..ae57f430667 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -3070,7 +3070,7 @@ std::string Creature::GetNameForLocaleIdx(LocaleConstant locale) 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