Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/PetAI: Validate GetCharmInfo()

Browse Source 
Fixes #24870

(cherry picked from commit bf62901053)
This commit is contained in:
jackpoz
2020-07-05 20:22:45 +02:00
committed by Shauren
parent d07ba6a103
commit 8fd7a4b6e5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/AI/CoreAI/PetAI.cpp
View File

@@ -367,6 +367,12 @@ void PetAI::HandleReturnMovement()
if (me->IsCharmed())
return;
if (!me->GetCharmInfo())
{
TC_LOG_WARN("scripts.ai.petai", "me->GetCharmInfo() is NULL in PetAI::HandleReturnMovement(). Debug info: %s", GetDebugInfo().c_str());
return;
}
if (me->GetCharmInfo()->HasCommandState(COMMAND_STAY))
{
if (!me->GetCharmInfo()->IsAtStay() && !me->GetCharmInfo()->IsReturning())
@@ -493,7 +499,7 @@ bool PetAI::CanAttack(Unit* target)
if (!me->GetCharmInfo())
{
TC_LOG_ERROR("scripts.ai.petai", "me->GetCharmInfo() is NULL in PetAI::CanAttack(). Debug info: %s", GetDebugInfo().c_str());
TC_LOG_WARN("scripts.ai.petai", "me->GetCharmInfo() is NULL in PetAI::CanAttack(). Debug info: %s", GetDebugInfo().c_str());
return false;
}