sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-05-17 11:00:13 -06:00
committed by GitHub
parent 9a6c789f1a 7870f3d1b3
commit cc94955bb2
28 changed files with 336 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Creature/TemporarySummon.cpp
+7 -5
View File
@@ -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?