From 428f8e0aaa62c144c3e6571607360bcc63110ce0 Mon Sep 17 00:00:00 2001 From: Angelo Venturini Date: Sat, 4 Mar 2023 12:31:05 -0300 Subject: [PATCH] fix: Crash on unit charm (#15256) --- src/server/game/Entities/Unit/Unit.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7bdb3d14b..0321294eb 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -15888,7 +15888,10 @@ bool CharmInfo::AddSpellToActionBar(SpellInfo const* spellInfo, ActiveStates new { WorldPacket data; creature->BuildCooldownPacket(data, SPELL_COOLDOWN_FLAG_NONE, spell_id, cooldown); - creature->GetCharmer()->ToPlayer()->SendDirectMessage(&data); + if (creature->GetCharmer() && creature->GetCharmer()->IsPlayer()) + { + creature->GetCharmer()->ToPlayer()->SendDirectMessage(&data); + } } }, 500ms); }