From 4675f21867a575d3c85a2b9c988984d461b0c5c2 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Tue, 17 May 2022 06:37:48 +0200 Subject: [PATCH] fix(Core): Crashfix. (#11741) --- .../game/Entities/Creature/TemporarySummon.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 44883f1fb..9f3c289e5 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -407,11 +407,13 @@ void Guardian::InitSummon() { TempSummon::InitSummon(); - Unit* m_owner = GetOwner(); - if (m_owner->GetTypeId() == TYPEID_PLAYER - && m_owner->GetMinionGUID() == GetGUID() - && !m_owner->GetCharmGUID()) - m_owner->ToPlayer()->CharmSpellInitialize(); + if (Unit* m_owner = GetOwner()) + { + if (m_owner->GetTypeId() == TYPEID_PLAYER && m_owner->GetMinionGUID() == GetGUID() && !m_owner->GetCharmGUID()) + { + m_owner->ToPlayer()->CharmSpellInitialize(); + } + } } Puppet::Puppet(SummonPropertiesEntry const* properties, ObjectGuid owner) : Minion(properties, owner, false), m_owner(owner) //maybe true?