fix(Core): Crashfix. (#11741)

This commit is contained in:
UltraNix
2022-05-17 06:37:48 +02:00
committed by GitHub
parent 78f66ce05e
commit 4675f21867
@@ -407,11 +407,13 @@ void Guardian::InitSummon()
{ {
TempSummon::InitSummon(); TempSummon::InitSummon();
Unit* m_owner = GetOwner(); if (Unit* m_owner = GetOwner())
if (m_owner->GetTypeId() == TYPEID_PLAYER {
&& m_owner->GetMinionGUID() == GetGUID() if (m_owner->GetTypeId() == TYPEID_PLAYER && m_owner->GetMinionGUID() == GetGUID() && !m_owner->GetCharmGUID())
&& !m_owner->GetCharmGUID()) {
m_owner->ToPlayer()->CharmSpellInitialize(); m_owner->ToPlayer()->CharmSpellInitialize();
}
}
} }
Puppet::Puppet(SummonPropertiesEntry const* properties, ObjectGuid owner) : Minion(properties, owner, false), m_owner(owner) //maybe true? Puppet::Puppet(SummonPropertiesEntry const* properties, ObjectGuid owner) : Minion(properties, owner, false), m_owner(owner) //maybe true?